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.

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

Refactor getter setter info in selection info panel #1106

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Refactor getter setter info in selection info panel #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59578be
Pass the full fieldItem object, not just the key
justvanrossum Feb 21, 2024
5619281
Refactor field value getting/setting to allow field items to override…
justvanrossum Feb 21, 2024
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
22 changes: 11 additions & 11 deletions src/fontra/client/web-components/ui-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export class Form extends SimpleElement {
inputElement.value = fieldItem.value || "";
inputElement.disabled = fieldItem.disabled;
inputElement.onchange = (event) => {
this._fieldChanging(fieldItem.key, inputElement.value, undefined);
this._fieldChanging(fieldItem, inputElement.value, undefined);
};
this._fieldGetters[fieldItem.key] = () => inputElement.value;
this._fieldSetters[fieldItem.key] = (value) => (inputElement.value = value);
Expand Down Expand Up @@ -190,7 +190,7 @@ export class Form extends SimpleElement {
}
inputElement.value = value;
}
this._fieldChanging(fieldItem.key, value, undefined);
this._fieldChanging(fieldItem, value, undefined);
};
this._fieldGetters[fieldItem.key] = () => inputElement.value;
this._fieldSetters[fieldItem.key] = (value) => (inputElement.value = value);
Expand All @@ -205,7 +205,7 @@ export class Form extends SimpleElement {
disabled: fieldItem.disabled,
onchange: () => {
let value = parseFloat(inputElement.value);
this._fieldChanging(fieldItem.key, value);
this._fieldChanging(fieldItem, value);
rotaryControl.value = -value;
},
});
Expand All @@ -221,7 +221,7 @@ export class Form extends SimpleElement {
inputElement.value = value;
if (event.dragBegin) {
valueStream = new QueueIterator(5, true);
this._fieldChanging(fieldItem.key, value, valueStream);
this._fieldChanging(fieldItem, value, valueStream);
}

if (valueStream) {
Expand All @@ -233,7 +233,7 @@ export class Form extends SimpleElement {
this._dispatchEvent("endChange", { key: fieldItem.key });
}
} else {
this._fieldChanging(fieldItem.key, value, undefined);
this._fieldChanging(fieldItem, value, undefined);
}
};
}
Expand All @@ -260,7 +260,7 @@ export class Form extends SimpleElement {
const value = event.value;
if (event.dragBegin) {
valueStream = new QueueIterator(5, true);
this._fieldChanging(fieldItem.key, value, valueStream);
this._fieldChanging(fieldItem, value, valueStream);
}

if (valueStream) {
Expand All @@ -272,7 +272,7 @@ export class Form extends SimpleElement {
this._dispatchEvent("endChange", { key: fieldItem.key });
}
} else {
this._fieldChanging(fieldItem.key, value, undefined);
this._fieldChanging(fieldItem, value, undefined);
}
};
}
Expand All @@ -284,15 +284,15 @@ export class Form extends SimpleElement {
this.contentElement.addEventListener(eventName, handler, options);
}

_fieldChanging(fieldKey, value, valueStream) {
_fieldChanging(fieldItem, value, valueStream) {
if (valueStream) {
this._dispatchEvent("beginChange", { key: fieldKey });
this._dispatchEvent("beginChange", { key: fieldItem.key });
} else {
this._dispatchEvent("doChange", { key: fieldKey, value: value });
this._dispatchEvent("doChange", { key: fieldItem.key, value: value });
}
const handlerName = "onFieldChange";
if (this[handlerName] !== undefined) {
this[handlerName](fieldKey, value, valueStream);
this[handlerName](fieldItem, value, valueStream);
}
}

Expand Down
46 changes: 33 additions & 13 deletions src/fontra/views/editor/panel-selection-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,17 +421,19 @@ export default class SelectionInfoPanel extends Panel {
}

async _setupSelectionInfoHandlers(glyphName) {
this.infoForm.onFieldChange = async (fieldKey, value, valueStream) => {
const changePath = JSON.parse(fieldKey);
const senderInfo = { senderID: this, fieldKeyPath: changePath };
this.infoForm.onFieldChange = async (fieldItem, value, valueStream) => {
const getFieldValue = fieldItem.getValue || defaultGetFieldValue;
const setFieldValue = fieldItem.setValue || defaultSetFieldValue;
const deleteFieldValue = fieldItem.deleteValue || defaultDeleteFieldValue;

await this.sceneController.editGlyph(async (sendIncrementalChange, glyph) => {
const layerInfo = Object.entries(
this.sceneController.getEditingLayerFromGlyphLayers(glyph.layers)
).map(([layerName, layerGlyph]) => {
return {
layerName,
layerGlyph,
orgValue: getNestedValue(layerGlyph, changePath),
orgValue: getFieldValue(layerGlyph, fieldItem),
};
});

Expand All @@ -442,17 +444,16 @@ export default class SelectionInfoPanel extends Panel {
for await (const value of valueStream) {
for (const { layerName, layerGlyph, orgValue } of layerInfo) {
if (orgValue !== undefined) {
setNestedValue(layerGlyph, changePath, orgValue); // Ensure getting the correct undo change
setFieldValue(layerGlyph, fieldItem, orgValue); // Ensure getting the correct undo change
} else {
deleteNestedValue(layerGlyph, changePath);
deleteFieldValue(layerGlyph, fieldItem);
}
}
changes = applyNewValue(
glyph,
layerInfo,
changePath,
value,
this._formFieldsByKey[fieldKey],
fieldItem,
this.multiEditChangesAreAbsolute
);
await sendIncrementalChange(changes.change, true); // true: "may drop"
Expand All @@ -462,13 +463,15 @@ export default class SelectionInfoPanel extends Panel {
changes = applyNewValue(
glyph,
layerInfo,
changePath,
value,
this._formFieldsByKey[fieldKey],
fieldItem,
this.multiEditChangesAreAbsolute
);
}

const changePath = JSON.parse(fieldItem.key);
const senderInfo = { senderID: this, fieldKeyPath: changePath };

const undoLabel =
changePath.length == 1
? `${changePath.at(-1)}`
Expand All @@ -483,6 +486,21 @@ export default class SelectionInfoPanel extends Panel {
}
}

function defaultGetFieldValue(subject, fieldItem) {
const changePath = JSON.parse(fieldItem.key);
return getNestedValue(subject, changePath);
}

function defaultSetFieldValue(subject, fieldItem, value) {
const changePath = JSON.parse(fieldItem.key);
return setNestedValue(subject, changePath, value);
}

function defaultDeleteFieldValue(subject, fieldItem) {
const changePath = JSON.parse(fieldItem.key);
return deleteNestedValue(subject, changePath);
}

function getNestedValue(subject, path) {
for (const pathElement of path) {
if (subject === undefined) {
Expand All @@ -507,7 +525,9 @@ function deleteNestedValue(subject, path) {
delete subject[key];
}

function applyNewValue(glyph, layerInfo, changePath, value, field, absolute) {
function applyNewValue(glyph, layerInfo, value, fieldItem, absolute) {
const setFieldValue = fieldItem.setValue || defaultSetFieldValue;

const primaryOrgValue = layerInfo[0].orgValue;
const isNumber = typeof primaryOrgValue === "number";
const delta = isNumber && !absolute ? value - primaryOrgValue : null;
Expand All @@ -517,9 +537,9 @@ function applyNewValue(glyph, layerInfo, changePath, value, field, absolute) {
let newValue =
delta === null || orgValue === undefined ? value : orgValue + delta;
if (isNumber) {
newValue = maybeClampValue(newValue, field.minValue, field.maxValue);
newValue = maybeClampValue(newValue, fieldItem.minValue, fieldItem.maxValue);
}
setNestedValue(layers[layerName].glyph, changePath, newValue);
setFieldValue(layers[layerName].glyph, fieldItem, newValue);
}
});
}
Expand Down