Skip to content

Commit

Permalink
[PDCL-12744] Implement move action (#1207)
Browse files Browse the repository at this point in the history
* [PDCL-12744] Implement move action

* Coerce css value to string before calling endsWith

---------

Co-authored-by: jonsnyder <[email protected]>
  • Loading branch information
dpopescu and jonsnyder authored Oct 31, 2024
1 parent c5272b2 commit 5729129
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 8 deletions.
12 changes: 6 additions & 6 deletions bundlesize.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"brotiliSize": 133
},
"dist/alloy.js": {
"uncompressedSize": 586693,
"gzippedSize": 89397,
"brotiliSize": 69488
"uncompressedSize": 587523,
"gzippedSize": 89373,
"brotiliSize": 69477
},
"dist/alloy.min.js": {
"uncompressedSize": 123179,
"gzippedSize": 40743,
"brotiliSize": 35341
"uncompressedSize": 122642,
"gzippedSize": 40537,
"brotiliSize": 35169
}
}
17 changes: 17 additions & 0 deletions src/components/Personalization/dom-actions/dom/util.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

export const addPxIfMissing = (value) => {
const hasPx = ("" + value).endsWith("px");

return hasPx ? value : `${value}px`;
};
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ import setText from "./setText.js";
import setAttributes from "./setAttributes.js";
import swapImage from "./swapImage.js";
import setStyles from "./setStyles.js";
import move from "./move.js";
import rearrangeChildren from "./rearrangeChildren.js";
import insertHtmlAfter from "./insertHtmlAfter.js";
import insertHtmlBefore from "./insertHtmlBefore.js";
import replaceHtml from "./replaceHtml.js";
import appendHtml from "./appendHtml.js";
import collectInteractions from "./collectInteractions.js";
import resize from "./resize.js";

export const DOM_ACTION_SET_HTML = "setHtml";
export const DOM_ACTION_CUSTOM_CODE = "customCode";
Expand Down Expand Up @@ -51,8 +53,8 @@ export default () => {
[DOM_ACTION_SET_ATTRIBUTE]: createAction(setAttributes),
[DOM_ACTION_SET_IMAGE_SOURCE]: createAction(swapImage),
[DOM_ACTION_SET_STYLE]: createAction(setStyles),
[DOM_ACTION_MOVE]: createAction(setStyles),
[DOM_ACTION_RESIZE]: createAction(setStyles),
[DOM_ACTION_MOVE]: createAction(move),
[DOM_ACTION_RESIZE]: createAction(resize),
[DOM_ACTION_REARRANGE]: createAction(rearrangeChildren),
[DOM_ACTION_REMOVE]: createAction(removeNode),
[DOM_ACTION_INSERT_AFTER]: createAction(insertHtmlAfter),
Expand Down
28 changes: 28 additions & 0 deletions src/components/Personalization/dom-actions/move.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

import { setStyle } from "./dom/index.js";
import { addPxIfMissing } from "./dom/util.js";

export default (container, styles, decorateProposition) => {
const { priority, ...style } = styles;

Object.keys(style).forEach((key) => {
let value = style[key];
if (key === "left" || key === "top") {
value = addPxIfMissing(value);
}
setStyle(container, key, value, priority);
});

decorateProposition(container);
};
28 changes: 28 additions & 0 deletions src/components/Personalization/dom-actions/resize.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

import { setStyle } from "./dom/index.js";
import { addPxIfMissing } from "./dom/util.js";

export default (container, styles, decorateProposition) => {
const { priority, ...style } = styles;

Object.keys(style).forEach((key) => {
let value = style[key];
if (key === "width" || key === "height") {
value = addPxIfMissing(value);
}
setStyle(container, key, value, priority);
});

decorateProposition(container);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

import { addPxIfMissing } from "../../../../../../../src/components/Personalization/dom-actions/dom/util.js";

describe("Personalization::DOM::util", () => {
it("appends 'px' string if missing", () => {
const value = "400";
const result = addPxIfMissing(value);

expect(result).toEqual("400px");
});

it("does not append 'px' string if already present", () => {
const value = "400px";
const result = addPxIfMissing(value);

expect(result).toEqual("400px");
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,29 @@ describe("Personalization::actions::move", () => {
expect(getAttribute(element, INTERACT_ID_DATA_ATTRIBUTE)).not.toBeNull();
});
});

it("should move personalized content even if coordinates are not properly formatted", () => {
const modules = initDomActionsModules();
const { move } = modules;
const element = createNode("div", { id: "move" });

appendNode(document.body, element);

const settings = {
selector: "#move",
prehidingSelector: "#move",
content: { left: "100", top: "100" },
meta: { a: 1 },
};

move(settings, decorateProposition).then(() => {
expect(element.style.left).toEqual("100px");
expect(element.style.top).toEqual("100px");

expect(getAttribute(element, CLICK_LABEL_DATA_ATTRIBUTE)).toEqual(
"trackingLabel",
);
expect(getAttribute(element, INTERACT_ID_DATA_ATTRIBUTE)).not.toBeNull();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,29 @@ describe("Personalization::actions::resize", () => {
expect(getAttribute(element, INTERACT_ID_DATA_ATTRIBUTE)).not.toBeNull();
});
});

it("should resize personalized content even if dimensions are not properly formatted", () => {
const modules = initDomActionsModules();
const { resize } = modules;
const element = createNode("div", { id: "resize" });

appendNode(document.body, element);

const settings = {
selector: "#resize",
prehidingSelector: "#resize",
content: { width: "100", height: "100" },
meta: { a: 1 },
};

return resize(settings, decorateProposition).then(() => {
expect(element.style.width).toEqual("100px");
expect(element.style.height).toEqual("100px");

expect(getAttribute(element, CLICK_LABEL_DATA_ATTRIBUTE)).toEqual(
"trackingLabel",
);
expect(getAttribute(element, INTERACT_ID_DATA_ATTRIBUTE)).not.toBeNull();
});
});
});

0 comments on commit 5729129

Please sign in to comment.