Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@taye
taye committed Jul 10, 2019
2 parents df12bd3 + b86177f commit e5780f3
Show file tree
Hide file tree
Showing 17 changed files with 101 additions and 70 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v1.4.13

- fixed restrictSize min and max function restrictions

## v1.4.12

- fixed errors from calling `interaction.stop()` in start event (#725)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@interactjs/_dev",
"version": "1.4.12",
"version": "1.4.13",
"private": true,
"workspaces": [
".",
Expand Down
6 changes: 3 additions & 3 deletions packages/actions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@interactjs/actions",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/auto-scroll/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@interactjs/auto-scroll",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/utils": "1.4.12"
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions packages/auto-start/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@interactjs/auto-start",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"devDependencies": {
"@interactjs/actions": "1.4.12"
"@interactjs/actions": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@interactjs/core",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/dev-tools": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/dev-tools": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"devDependencies": {
"@interactjs/actions": "1.4.12",
"@interactjs/auto-start": "1.4.12"
"@interactjs/actions": "1.4.13",
"@interactjs/auto-start": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions packages/dev-tools/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@interactjs/dev-tools",
"version": "1.4.12",
"version": "1.4.13",
"dependencies": {
"@interactjs/utils": "1.4.12"
"@interactjs/utils": "1.4.13"
},
"devDependencies": {
"@interactjs/actions": "1.4.12",
"@interactjs/core": "1.4.12"
"@interactjs/actions": "1.4.13",
"@interactjs/core": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions packages/inertia/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@interactjs/inertia",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/modifiers": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/modifiers": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"devDependencies": {
"@interactjs/actions": "1.4.12"
"@interactjs/actions": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
22 changes: 11 additions & 11 deletions packages/interact/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@interactjs/interact",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/actions": "1.4.12",
"@interactjs/auto-scroll": "1.4.12",
"@interactjs/auto-start": "1.4.12",
"@interactjs/core": "1.4.12",
"@interactjs/dev-tools": "1.4.12",
"@interactjs/inertia": "1.4.12",
"@interactjs/modifiers": "1.4.12",
"@interactjs/pointer-events": "1.4.12",
"@interactjs/reflow": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/actions": "1.4.13",
"@interactjs/auto-scroll": "1.4.13",
"@interactjs/auto-start": "1.4.13",
"@interactjs/core": "1.4.13",
"@interactjs/dev-tools": "1.4.13",
"@interactjs/inertia": "1.4.13",
"@interactjs/modifiers": "1.4.13",
"@interactjs/pointer-events": "1.4.13",
"@interactjs/reflow": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions packages/interactjs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "interactjs",
"version": "1.4.12",
"version": "1.4.13",
"repository": {
"type": "git",
"url": "https://github.com/taye/interact.js.git"
Expand Down Expand Up @@ -38,12 +38,12 @@
],
"license": "MIT",
"dependencies": {
"@interactjs/types": "1.4.12"
"@interactjs/types": "1.4.13"
},
"devDependencies": {
"@interactjs/interact": "1.4.12",
"@interactjs/modifiers": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/interact": "1.4.13",
"@interactjs/modifiers": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"_dev": {
"entries": "./index.ts",
Expand Down
6 changes: 3 additions & 3 deletions packages/modifiers/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@interactjs/modifiers",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
39 changes: 33 additions & 6 deletions packages/modifiers/restrict/size.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import test from '@interactjs/_dev/test/test'
import { mockSignals } from '@interactjs/core/tests/_helpers'

import Interaction from '@interactjs/core/Interaction'
import * as helpers from '@interactjs/core/tests/_helpers'
import rectUtils from '@interactjs/utils/rect'
import base from './../base'
import restrictSize from './../restrict/size'

test('restrictSize', (t) => {
const {
interaction,
} = helpers.testEnv()
const edges = { left: true, top: true }
const rect = { left: 0, top: 0, right: 200, bottom: 300 }
const interaction = new Interaction({ signals: mockSignals() } as any)

interaction.prepared = { name: null }
interaction.prepared.edges = edges
Expand All @@ -19,8 +19,8 @@ test('restrictSize', (t) => {
interaction._interacting = true

const options = {
min: { width: 60, height: 50 },
max: { width: 300, height: 350 },
min: { width: 60, height: 50 } as any,
max: { width: 300, height: 350 } as any,
}
const startCoords = Object.freeze({ x: 0, y: 0 })
const offset = { top: 0, bottom: 0, left: 0, right: 0 }
Expand Down Expand Up @@ -60,5 +60,32 @@ test('restrictSize', (t) => {

t.deepEqual(arg.coords, { x: 140, y: 250 }, 'outside min')

// min and max function restrictions
let minFuncArgs
let maxFuncArgs

options.min = (...args) => {
minFuncArgs = args
return null
}
options.max = (...args) => {
maxFuncArgs = args
return null
}

restrictSize.set(arg)

t.deepEqual(
minFuncArgs,
[arg.coords.x, arg.coords.y, interaction],
'correct args are passed to min function restriction',
)

t.deepEqual(
maxFuncArgs,
[arg.coords.x, arg.coords.y, interaction],
'correct args are passed to max function restriction',
)

t.end()
})
4 changes: 2 additions & 2 deletions packages/modifiers/restrict/size.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ function set (arg) {

const rect = rectUtils.xywhToTlbr(interaction.resizeRects.inverted)

const minSize = rectUtils.tlbrToXywh(restrictEdges.getRestrictionRect(options.min, interaction)) || noMin
const maxSize = rectUtils.tlbrToXywh(restrictEdges.getRestrictionRect(options.max, interaction)) || noMax
const minSize = rectUtils.tlbrToXywh(restrictEdges.getRestrictionRect(options.min, interaction, arg.coords)) || noMin
const maxSize = rectUtils.tlbrToXywh(restrictEdges.getRestrictionRect(options.max, interaction, arg.coords)) || noMax

state.options = {
enabled: options.enabled,
Expand Down
6 changes: 3 additions & 3 deletions packages/pointer-events/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@interactjs/pointer-events",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/reflow/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@interactjs/reflow",
"version": "1.4.12",
"version": "1.4.13",
"peerDependencies": {
"@interactjs/core": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/core": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"devDependencies": {
"promise-polyfill": "latest"
Expand Down
24 changes: 12 additions & 12 deletions packages/types/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "@interactjs/types",
"version": "1.4.12",
"version": "1.4.13",
"dependencies": {
"@interactjs/actions": "1.4.12",
"@interactjs/auto-scroll": "1.4.12",
"@interactjs/auto-start": "1.4.12",
"@interactjs/core": "1.4.12",
"@interactjs/dev-tools": "1.4.12",
"@interactjs/inertia": "1.4.12",
"@interactjs/interact": "1.4.12",
"@interactjs/modifiers": "1.4.12",
"@interactjs/pointer-events": "1.4.12",
"@interactjs/reflow": "1.4.12",
"@interactjs/utils": "1.4.12"
"@interactjs/actions": "1.4.13",
"@interactjs/auto-scroll": "1.4.13",
"@interactjs/auto-start": "1.4.13",
"@interactjs/core": "1.4.13",
"@interactjs/dev-tools": "1.4.13",
"@interactjs/inertia": "1.4.13",
"@interactjs/interact": "1.4.13",
"@interactjs/modifiers": "1.4.13",
"@interactjs/pointer-events": "1.4.13",
"@interactjs/reflow": "1.4.13",
"@interactjs/utils": "1.4.13"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@interactjs/utils",
"version": "1.4.12",
"version": "1.4.13",
"publishConfig": {
"access": "public"
}
Expand Down

0 comments on commit e5780f3

Please sign in to comment.