Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Per-action modifiers array #625

Merged
merged 16 commits into from
Jun 3, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
modifiers: rename modifiedCoords to coords
  • Loading branch information
taye committed Jun 1, 2018
commit 30bd78d17237acc3a37ac38e0f7a67350419b852
8 changes: 4 additions & 4 deletions packages/modifiers/base.js
Original file line number Diff line number Diff line change
@@ -62,10 +62,10 @@ function startAll (arg) {
function setAll (arg) {
const { interaction, statuses, preEnd, requireEndOnly } = arg;

arg.modifiedCoords = extend({}, arg.pageCoords);
arg.coords = extend({}, arg.pageCoords);

const result = {
coords: arg.modifiedCoords,
coords: arg.coords,
shouldMove: true,
};

@@ -79,8 +79,8 @@ function setAll (arg) {
arg.status = status;
status.methods.set(arg);

arg.modifiedCoords.x += status.delta.x;
arg.modifiedCoords.y += status.delta.y;
arg.coords.x += status.delta.x;
arg.coords.y += status.delta.y;

result.delta.x += status.delta.x;
result.delta.y += status.delta.y;
4 changes: 2 additions & 2 deletions packages/modifiers/restrict.js
Original file line number Diff line number Diff line change
@@ -21,12 +21,12 @@ function start ({ rect, startOffset, status }) {
status.offset = offset;
}

function set ({ modifiedCoords, interaction, status, phase }) {
function set ({ coords, interaction, status, phase }) {
const { options, offset } = status;

if (phase === 'start' && options.elementRect) { return; }

const page = extend({}, modifiedCoords);
const page = extend({}, coords);
const restriction = getRestrictionRect(options.restriction, interaction, page);

if (!restriction) { return status; }
4 changes: 2 additions & 2 deletions packages/modifiers/restrictEdges.js
Original file line number Diff line number Diff line change
@@ -38,15 +38,15 @@ function start ({ interaction, status }) {
};
}

function set ({ modifiedCoords, interaction, status, phase }) {
function set ({ coords, interaction, status, phase }) {
const { offset, options } = status;
const edges = interaction.prepared.linkedEdges || interaction.prepared.edges;

if (!interaction.interacting() || !edges || phase === 'start') {
return;
}

const page = extend({}, modifiedCoords);
const page = extend({}, coords);
const inner = getRestrictionRect(options.inner, interaction, page) || {};
const outer = getRestrictionRect(options.outer, interaction, page) || {};

4 changes: 2 additions & 2 deletions packages/modifiers/snap.js
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ function start ({ interaction, interactable, element, rect, status, startOffset
status.offset = offsets;
}

function set ({ interaction, modifiedCoords, status, phase }) {
function set ({ interaction, coords, status, phase }) {
const { options, offset: offsets } = status;
const relativePoints = options && options.relativePoints;

@@ -44,7 +44,7 @@ function set ({ interaction, modifiedCoords, status, phase }) {
}

const origin = utils.getOriginXY(interaction.target, interaction.element, interaction.prepared.name);
const page = utils.extend({}, modifiedCoords);
const page = utils.extend({}, coords);
const targets = [];
let target;
let i;
6 changes: 3 additions & 3 deletions packages/modifiers/snapSize.js
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@ function start (arg) {
}

function set (arg) {
const { interaction, status, modifiedCoords } = arg;
const { interaction, status, coords } = arg;
const { options, offset } = status;
const relative = {
x: modifiedCoords.x - offset[0].x,
y: modifiedCoords.y - offset[0].y,
x: coords.x - offset[0].x,
y: coords.y - offset[0].y,
};

status.options = extend({}, options);
2 changes: 1 addition & 1 deletion packages/modifiers/tests/restrictEdges.js
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ test('restrictEdges', t => {
options,
offset,
};
const arg = { interaction, status, modifiedCoords: coords };
const arg = { interaction, status, coords };

// outer restriction
options.outer = { top: 100, left: 100, bottom: 200, right: 200 };
2 changes: 1 addition & 1 deletion packages/modifiers/tests/snap.js
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ test('modifiers/snap', t => {
interaction,
status,
pageCoords,
modifiedCoords: { ...pageCoords },
coords: { ...pageCoords },
};

snap.set(arg);
2 changes: 1 addition & 1 deletion packages/modifiers/tests/snapEdges.js
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ test('modifiers/snapEdges', t => {
interactable: interaction.target,
status: null,
pageCoords,
modifiedCoords: { ...pageCoords },
coords: { ...pageCoords },
offset: [{ x: 0, y: 0 }],
};

2 changes: 1 addition & 1 deletion packages/modifiers/tests/snapSize.js
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ test('modifiers/snapSize', t => {
interactable: interaction.target,
status,
pageCoords,
modifiedCoords: { ...pageCoords },
coords: { ...pageCoords },
};

snapSize.start(arg);