Skip to content

Fix/rotation preservation master overrides #1748

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

Merged
merryman merged 2 commits into from
Jul 23, 2025
Merged

Fix/rotation preservation master overrides #1748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0edd66
Revert "🎨: apply rotation for root of component for now"
merryman Mar 13, 2025
ec512a2
🎨: move transform props to module top level in policy
merryman Mar 13, 2025
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
4 changes: 2 additions & 2 deletions lively.morphic/components/policy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Icons } from '../text/icons.js';

const skippedValue = Symbol.for('lively.skip-property');
const PROPS_TO_RESET = ['dropShadow', 'fill', 'opacity', 'borderWidth', 'fontColor'];
const TRANSFORM_PROPS = ['extent', 'position', 'rotation', 'scale', 'lineHeight'];
const TEXT_TYPES = ['text', 'label', Text, Label];
const expressionSerializer = new ExpressionSerializer();

Expand Down Expand Up @@ -1196,7 +1197,6 @@ export class StylePolicy {
*/
synthesizeSubSpec (submorphNameInPolicyContext, ownerOfScope, previousTarget) {
const isRoot = !submorphNameInPolicyContext;
const transformProps = ['extent', 'position', 'scale', 'lineHeight'];
let subSpec = this.getSubSpecFor(submorphNameInPolicyContext) || {}; // get the sub spec for the submorphInPolicyContext

if (subSpec.isPolicy) {
Expand Down Expand Up @@ -1225,7 +1225,7 @@ export class StylePolicy {
}

if (isRoot) {
for (let prop of transformProps) {
for (let prop of TRANSFORM_PROPS) {
if (parentSpec[prop]) delete nextLevelSpec[prop];
}
}
Expand Down