Skip to content

Escape attractors when moving via keyboard #2082

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.

Sign up for GitHub

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

Draft
wants to merge 7 commits into
base: legacy
Choose a base branch
from
Draft

Escape attractors when moving via keyboard #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec7e754
change circle movement with a subset of constrained points
dqnykamp Apr 23, 2023
7fcd48c
New constrained movement behavior for other components
dqnykamp Apr 24, 2023
b0932b2
allowFlexibleMotion attribute restores old behavior
dqnykamp Apr 24, 2023
c635d9a
add tests
dqnykamp Apr 25, 2023
2bc23c9
First attempt to get image unstuck from attractor when moved via keyb…
dqnykamp Apr 21, 2023
78116cc
extend to all components with anchor points
dqnykamp Apr 23, 2023
e6bfc6e
refine keyboard escape, extend to point
dqnykamp Apr 23, 2023
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
10,422 changes: 9,326 additions & 1,096 deletions cypress/e2e/DoenetML/tagSpecific/circle.cy.js
View file
Open in desktop

Large diffs are not rendered by default.

200 changes: 195 additions & 5 deletions cypress/e2e/DoenetML/tagSpecific/line.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ describe("Line Tag Tests", function () {
<copy target="a" />)
</point>
<point>(5,3)</point>
<line through="$_point1 $_point2" />
<line through="$_point1 $_point2" allowFlexibleMotion />
</graph>
<math name="a" hide simplify><copy prop="x" target="_point2" />+1</math>
<copy prop="point1" target="_line1" assignNames="p1" />
Expand Down Expand Up @@ -4547,7 +4547,7 @@ describe("Line Tag Tests", function () {
<text>a</text>
<graph name="g1" newNamespace>
<point hide fixed>(-5,9)</point>
<line name="l" through="$_point1" />
<line name="l" through="$_point1" allowFlexibleMotion />
<copy assignNames="A" prop="point1" target="l" />
<copy assignNames="B" prop="point2" target="l" />
</graph>
Expand Down Expand Up @@ -5503,7 +5503,7 @@ describe("Line Tag Tests", function () {
</sources>
</map>
<graph name="g1" newNamespace>
<line through="$(../_map1)" name="l" />
<line through="$(../_map1)" name="l" allowFlexibleMotion />
<copy assignNames="A" prop="point1" target="l" />
<copy assignNames="B" prop="point2" target="l" />
</graph>
Expand Down Expand Up @@ -6220,7 +6220,7 @@ describe("Line Tag Tests", function () {
doenetML: `
<text>a</text>
<graph>
<line through="(3, $(_line1.pointX1_1)) (4,5)" />
<line through="(3, $(_line1.pointX1_1)) (4,5)" allowFlexibleMotion />
</graph>

<graph>
Expand Down Expand Up @@ -6575,7 +6575,7 @@ describe("Line Tag Tests", function () {
doenetML: `
<text>a</text>
<graph>
<line through="(3,$(la.pointX1_1)) (4,5)" />
<line through="(3,$(la.pointX1_1)) (4,5)" allowFlexibleMotion />
</graph>

<graph>
Expand Down Expand Up @@ -12042,4 +12042,194 @@ describe("Line Tag Tests", function () {
"rgb(0, 0, 255)",
);
});

it("line through two points, one constrained to grid", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
<text>a</text>
<graph>
<point name="P" labelIsName>(3,5)
<constraints><constrainToGrid dx="2" dy="3" /></constraints>
</point>
<point name="Q" labelIsName>(-4,-1)</point>
<line through="$P $Q" />
</graph>
<copy target="P" assignNames="Pa" />
<copy target="Q" assignNames="Qa" />
`,
},
"*",
);
});

cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait for page to load

let x1 = 4,
y1 = 6;
let x2 = -4,
y2 = -1;

cy.get(cesc2("#/Pa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x1)},${nInDOM(y1)})`,
);
cy.get(cesc2("#/Qa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x2)},${nInDOM(y2)})`,
);

cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/P"].stateValues.xs[0]).eq(x1);
expect(stateVariables["/P"].stateValues.xs[1]).eq(y1);
expect(stateVariables["/P"].stateValues.coords).eqls(["vector", x1, y1]);
expect(stateVariables["/Q"].stateValues.xs[0]).eq(x2);
expect(stateVariables["/Q"].stateValues.xs[1]).eq(y2);
expect(stateVariables["/Q"].stateValues.coords).eqls(["vector", x2, y2]);
});

cy.log(
"move line down 4 and right 0.5 actually moves it down 3 and right none",
);
cy.window().then(async (win) => {
let dx = 0.5,
dy = -4;

let x1Desired = x1 + dx;
let y1Desired = y1 + dy;
let x2Desired = x2 + dx;
let y2Desired = y2 + dy;

dx = 0;
dy = -3;
x1 += dx;
y1 += dy;
x2 += dx;
y2 += dy;

win.callAction1({
actionName: "moveLine",
componentName: "/_line1",
args: {
point1coords: [x1Desired, y1Desired],
point2coords: [x2Desired, y2Desired],
},
});

cy.get(cesc2("#/Pa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x1)},${nInDOM(y1)})`,
);
cy.get(cesc2("#/Qa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x2)},${nInDOM(y2)})`,
);
});

cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/P"].stateValues.xs[0]).eq(x1);
expect(stateVariables["/P"].stateValues.xs[1]).eq(y1);
expect(stateVariables["/P"].stateValues.coords).eqls(["vector", x1, y1]);
expect(stateVariables["/Q"].stateValues.xs[0]).eq(x2);
expect(stateVariables["/Q"].stateValues.xs[1]).eq(y2);
expect(stateVariables["/Q"].stateValues.coords).eqls(["vector", x2, y2]);
});
});

it("line through two points, one constrained to grid, allow flexible motion", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
<text>a</text>
<graph>
<point name="P" labelIsName>(3,5)
<constraints><constrainToGrid dx="2" dy="3" /></constraints>
</point>
<point name="Q" labelIsName>(-4,-1)</point>
<line through="$P $Q" allowFlexibleMotion />
</graph>
<copy target="P" assignNames="Pa" />
<copy target="Q" assignNames="Qa" />
`,
},
"*",
);
});

cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait for page to load

let x1 = 4,
y1 = 6;
let x2 = -4,
y2 = -1;

cy.get(cesc2("#/Pa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x1)},${nInDOM(y1)})`,
);
cy.get(cesc2("#/Qa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x2)},${nInDOM(y2)})`,
);

cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/P"].stateValues.xs[0]).eq(x1);
expect(stateVariables["/P"].stateValues.xs[1]).eq(y1);
expect(stateVariables["/P"].stateValues.coords).eqls(["vector", x1, y1]);
expect(stateVariables["/Q"].stateValues.xs[0]).eq(x2);
expect(stateVariables["/Q"].stateValues.xs[1]).eq(y2);
expect(stateVariables["/Q"].stateValues.coords).eqls(["vector", x2, y2]);
});

cy.log("move line down 4 and right 0.5");
cy.window().then(async (win) => {
let dx = 0.5,
dy = -4;

let x1Desired = x1 + dx;
let y1Desired = y1 + dy;
let x2Desired = x2 + dx;
let y2Desired = y2 + dy;

dx = 0;
dy = -3;
x1 += dx;
y1 += dy;
x2 = x2Desired;
y2 = y2Desired;

win.callAction1({
actionName: "moveLine",
componentName: "/_line1",
args: {
point1coords: [x1Desired, y1Desired],
point2coords: [x2Desired, y2Desired],
},
});

cy.get(cesc2("#/Pa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x1)},${nInDOM(y1)})`,
);
cy.get(cesc2("#/Qa") + " .mjx-mrow").should(
"contain.text",
`(${nInDOM(x2)},${nInDOM(y2)})`,
);
});

cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/P"].stateValues.xs[0]).eq(x1);
expect(stateVariables["/P"].stateValues.xs[1]).eq(y1);
expect(stateVariables["/P"].stateValues.coords).eqls(["vector", x1, y1]);
expect(stateVariables["/Q"].stateValues.xs[0]).eq(x2);
expect(stateVariables["/Q"].stateValues.xs[1]).eq(y2);
expect(stateVariables["/Q"].stateValues.coords).eqls(["vector", x2, y2]);
});
});
});
Loading