mirror of
https://github.com/penpot/penpot.git
synced 2026-11-18 08:01:21 +00:00
🐛 Show resolved value when opening an alias token edit form (#13038)
* 🐛 Show resolved color in alias token edit form swatch The color token form opened every alias token with an empty swatch. The resolved value only reached :color-result once the value field was touched, so the swatch had nothing to show on open. Keep the resolved color for the swatch when the field is untouched, without showing the "resolved value" hint. Add an e2e test that loads a fixture with a color token and an alias to it. Closes #12672 AI-assisted-by: claude-opus-5-5 * 🐛 Show resolved value when opening an alias token edit form The token edit form only showed "Resolved value" after typing in the value field: the single-value inputs dropped the first resolution while the field was untouched, and the typography/shadow reference field read its first value from [:value :reference], which an alias token does not have (its value is the reference string). Show the hint on open when the resolved value differs from the written one, so a plain `16` gets no `Resolved value: 16`. Start the reference field stream with the alias string. Extend the e2e fixture with font size and typography aliases and add a test for them. Closes #12788 AI-assisted-by: claude-opus-5-5
This commit is contained in:
parent
0fda857426
commit
82421f9729
293
frontend/playwright/data/workspace/get-file-tokens-alias.json
Normal file
293
frontend/playwright/data/workspace/get-file-tokens-alias.json
Normal file
@ -0,0 +1,293 @@
|
||||
{
|
||||
"~:features": {
|
||||
"~#set": [
|
||||
"fdata/path-data",
|
||||
"plugins/runtime",
|
||||
"design-tokens/v1",
|
||||
"variants/v1",
|
||||
"layout/grid",
|
||||
"styles/v2",
|
||||
"fdata/objects-map",
|
||||
"tokens/numeric-input",
|
||||
"render-wasm/v1",
|
||||
"components/v2",
|
||||
"fdata/shape-data-type"
|
||||
]
|
||||
},
|
||||
"~:team-id": "~uc6b102e2-5aaa-809c-8007-dcd1eab2135d",
|
||||
"~:permissions": {
|
||||
"~:type": "~:membership",
|
||||
"~:is-owner": true,
|
||||
"~:is-admin": true,
|
||||
"~:can-edit": true,
|
||||
"~:can-read": true,
|
||||
"~:is-logged": true
|
||||
},
|
||||
"~:has-media-trimmed": false,
|
||||
"~:comment-thread-seqn": 0,
|
||||
"~:name": "New File 11",
|
||||
"~:revn": 3,
|
||||
"~:modified-at": "~m1779204621124",
|
||||
"~:vern": 0,
|
||||
"~:id": "~uc7ce0794-0992-8105-8004-38f280443849",
|
||||
"~:is-shared": false,
|
||||
"~:migrations": {
|
||||
"~#ordered-set": [
|
||||
"legacy-2",
|
||||
"legacy-3",
|
||||
"legacy-5",
|
||||
"legacy-6",
|
||||
"legacy-7",
|
||||
"legacy-8",
|
||||
"legacy-9",
|
||||
"legacy-10",
|
||||
"legacy-11",
|
||||
"legacy-12",
|
||||
"legacy-13",
|
||||
"legacy-14",
|
||||
"legacy-16",
|
||||
"legacy-17",
|
||||
"legacy-18",
|
||||
"legacy-19",
|
||||
"legacy-25",
|
||||
"legacy-26",
|
||||
"legacy-27",
|
||||
"legacy-28",
|
||||
"legacy-29",
|
||||
"legacy-31",
|
||||
"legacy-32",
|
||||
"legacy-33",
|
||||
"legacy-34",
|
||||
"legacy-36",
|
||||
"legacy-37",
|
||||
"legacy-38",
|
||||
"legacy-39",
|
||||
"legacy-40",
|
||||
"legacy-41",
|
||||
"legacy-42",
|
||||
"legacy-43",
|
||||
"legacy-44",
|
||||
"legacy-45",
|
||||
"legacy-46",
|
||||
"legacy-47",
|
||||
"legacy-48",
|
||||
"legacy-49",
|
||||
"legacy-50",
|
||||
"legacy-51",
|
||||
"legacy-52",
|
||||
"legacy-53",
|
||||
"legacy-54",
|
||||
"legacy-55",
|
||||
"legacy-56",
|
||||
"legacy-57",
|
||||
"legacy-59",
|
||||
"legacy-62",
|
||||
"legacy-65",
|
||||
"legacy-66",
|
||||
"legacy-67",
|
||||
"0001-remove-tokens-from-groups",
|
||||
"0002-normalize-bool-content-v2",
|
||||
"0002-clean-shape-interactions",
|
||||
"0003-fix-root-shape",
|
||||
"0003-convert-path-content-v2",
|
||||
"0005-deprecate-image-type",
|
||||
"0006-fix-old-texts-fills",
|
||||
"0008-fix-library-colors-v4",
|
||||
"0009-clean-library-colors",
|
||||
"0009-add-partial-text-touched-flags",
|
||||
"0010-fix-swap-slots-pointing-non-existent-shapes",
|
||||
"0011-fix-invalid-text-touched-flags",
|
||||
"0012-fix-position-data",
|
||||
"0013-fix-component-path",
|
||||
"0013-clear-invalid-strokes-and-fills",
|
||||
"0014-fix-tokens-lib-duplicate-ids",
|
||||
"0014-clear-components-nil-objects",
|
||||
"0015-fix-text-attrs-blank-strings",
|
||||
"0015-clean-shadow-color",
|
||||
"0016-copy-fills-from-position-data-to-text-node",
|
||||
"0017-fix-layout-flex-dir",
|
||||
"0018-remove-unneeded-objects-from-components",
|
||||
"0019-fix-missing-swap-slots",
|
||||
"0020-sync-component-id-with-near-main"
|
||||
]
|
||||
},
|
||||
"~:version": 67,
|
||||
"~:project-id": "~u4cdd76d8-0e6d-8168-8008-0118118e1a1a",
|
||||
"~:created-at": "~m1779204571619",
|
||||
"~:backend": "legacy-db",
|
||||
"~:data": {
|
||||
"~:pages": [
|
||||
"~u9fb430ed-e1e9-81bc-8008-0b7ae978d9c5"
|
||||
],
|
||||
"~:pages-index": {
|
||||
"~u9fb430ed-e1e9-81bc-8008-0b7ae978d9c5": {
|
||||
"~:objects": {
|
||||
"~#penpot/objects-map/v2": {
|
||||
"~u00000000-0000-0000-0000-000000000000": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"Root Frame\",\"~:width\",0.01,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0.0,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.01]],[\"^:\",[\"^ \",\"~:x\",0.0,\"~:y\",0.01]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1.0,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^6\",0.01,\"~:height\",0.01,\"~:x1\",0,\"~:y1\",0,\"~:x2\",0.01,\"~:y2\",0.01]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^H\",0.01,\"~:flip-y\",null,\"~:shapes\",[]]]"
|
||||
}
|
||||
},
|
||||
"~:id": "~u9fb430ed-e1e9-81bc-8008-0b7ae978d9c5",
|
||||
"~:name": "Page 1"
|
||||
}
|
||||
},
|
||||
"~:id": "~uc7ce0794-0992-8105-8004-38f280443849",
|
||||
"~:options": {
|
||||
"~:components-v2": true,
|
||||
"~:base-font-size": "16px"
|
||||
},
|
||||
"~:tokens-status": {
|
||||
"~#penpot/tokens-status": {
|
||||
"~:active-theme-ids": {
|
||||
"~#set": []
|
||||
},
|
||||
"~:active-set-ids": {
|
||||
"~#set": [
|
||||
"~u1dc5cafc-6d57-808d-8008-0b7af8180cbd"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"~:tokens-lib": {
|
||||
"~#penpot/tokens-lib": {
|
||||
"~:sets": {
|
||||
"~#ordered-map": [
|
||||
[
|
||||
"S-Global",
|
||||
{
|
||||
"~#penpot/token-set": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8180cbd",
|
||||
"~:name": "Global",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204621126",
|
||||
"~:tokens": {
|
||||
"~#ordered-map": [
|
||||
[
|
||||
"color.primary",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181201",
|
||||
"~:name": "color.primary",
|
||||
"~:type": "~:color",
|
||||
"~:value": "#ff0000",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"color.alias",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181202",
|
||||
"~:name": "color.alias",
|
||||
"~:type": "~:color",
|
||||
"~:value": "{color.primary}",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"font-size.base",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181203",
|
||||
"~:name": "font-size.base",
|
||||
"~:type": "~:font-size",
|
||||
"~:value": "16",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"font-size.alias",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181204",
|
||||
"~:name": "font-size.alias",
|
||||
"~:type": "~:font-size",
|
||||
"~:value": "{font-size.base}",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"typography.base",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181205",
|
||||
"~:name": "typography.base",
|
||||
"~:type": "~:typography",
|
||||
"~:value": {
|
||||
"~:font-family": [
|
||||
"Roboto"
|
||||
],
|
||||
"~:font-size": "18",
|
||||
"~:font-weight": "bold"
|
||||
},
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
],
|
||||
[
|
||||
"typography.alias",
|
||||
{
|
||||
"~#penpot/token": {
|
||||
"~:id": "~u1dc5cafc-6d57-808d-8008-0b7af8181206",
|
||||
"~:name": "typography.alias",
|
||||
"~:type": "~:typography",
|
||||
"~:value": "{typography.base}",
|
||||
"~:description": "",
|
||||
"~:modified-at": "~m1779204586592"
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"~:themes": {
|
||||
"~#ordered-map": [
|
||||
[
|
||||
"",
|
||||
{
|
||||
"~#ordered-map": [
|
||||
[
|
||||
"__PENPOT__HIDDEN__TOKEN__THEME__",
|
||||
{
|
||||
"~#penpot/token-theme": {
|
||||
"~:id": "~u00000000-0000-0000-0000-000000000000",
|
||||
"~:name": "__PENPOT__HIDDEN__TOKEN__THEME__",
|
||||
"~:group": "",
|
||||
"~:description": "",
|
||||
"~:is-source": false,
|
||||
"~:external-id": "",
|
||||
"~:modified-at": "~m1779204586593",
|
||||
"~:sets": {
|
||||
"~#set": [
|
||||
"Global"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"~:active-themes": {
|
||||
"~#set": [
|
||||
"/__PENPOT__HIDDEN__TOKEN__THEME__"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2538,6 +2538,76 @@ test.describe("Tokens tab - edition", () => {
|
||||
await expect(valueField).toHaveValue(/^rgba(.*)$/);
|
||||
});
|
||||
|
||||
const openEditTokenForm = async (setup, type, name) => {
|
||||
const { tokensSidebar, tokenContextMenuForToken, tokensUpdateCreateModal } =
|
||||
setup;
|
||||
const kebabType = type.replace(/\s/g, "-");
|
||||
|
||||
await unfoldTokenType(tokensSidebar, type);
|
||||
await tokensSidebar
|
||||
.getByTestId(`section-${kebabType}`)
|
||||
.getByRole("button", { name })
|
||||
.first()
|
||||
.click({ button: "right" });
|
||||
await expect(tokenContextMenuForToken).toBeVisible();
|
||||
await tokenContextMenuForToken.getByText("Edit token").click();
|
||||
await expect(tokensUpdateCreateModal).toBeVisible();
|
||||
};
|
||||
|
||||
test("BUG: 12672 Edit form shows the resolved color of an alias token", async ({
|
||||
page,
|
||||
}) => {
|
||||
const setup = await setupTokensFileRender(page, {
|
||||
file: "workspace/get-file-tokens-alias.json",
|
||||
});
|
||||
const { tokensUpdateCreateModal } = setup;
|
||||
|
||||
await openEditTokenForm(setup, "color", "alias");
|
||||
|
||||
await expect(tokensUpdateCreateModal.getByLabel("Value")).toHaveValue(
|
||||
"{color.primary}",
|
||||
);
|
||||
await expect(
|
||||
tokensUpdateCreateModal.getByText("Resolved value: #ff0000"),
|
||||
).toBeVisible();
|
||||
|
||||
const swatchColor = tokensUpdateCreateModal
|
||||
.getByTestId("token-form-color-bullet")
|
||||
.locator("div[style*='background']")
|
||||
.first();
|
||||
await expect(swatchColor).toHaveCSS("background-color", "rgb(255, 0, 0)");
|
||||
});
|
||||
|
||||
test("BUG: 12788 Edit form shows the resolved value of an alias token on open", async ({
|
||||
page,
|
||||
}) => {
|
||||
const setup = await setupTokensFileRender(page, {
|
||||
file: "workspace/get-file-tokens-alias.json",
|
||||
});
|
||||
const { tokensUpdateCreateModal } = setup;
|
||||
const resolvedValue = tokensUpdateCreateModal.getByText("Resolved value:");
|
||||
|
||||
// Font size alias
|
||||
await openEditTokenForm(setup, "font size", "alias");
|
||||
await expect(
|
||||
tokensUpdateCreateModal.getByText("Resolved value: 16"),
|
||||
).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
|
||||
// Font size with a plain value: no hint repeating the value
|
||||
await openEditTokenForm(setup, "font size", "base");
|
||||
await expect(tokensUpdateCreateModal.getByLabel("Value")).toHaveValue("16");
|
||||
await expect(resolvedValue).not.toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
|
||||
// Typography alias
|
||||
await openEditTokenForm(setup, "typography", "alias");
|
||||
await expect(resolvedValue).toBeVisible();
|
||||
await expect(
|
||||
tokensUpdateCreateModal.getByText("Font Size: 18"),
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
test("User sees self-reference error when editing a token to create a circular reference", async ({
|
||||
page,
|
||||
}) => {
|
||||
|
||||
@ -281,19 +281,28 @@
|
||||
(d/update-when result :error wte/resolve-error-message)))
|
||||
(rx/subs! (fn [{:keys [error value]}]
|
||||
(let [touched? (get-in @form [:touched input-name])]
|
||||
(when touched?
|
||||
(if error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] {:message error})
|
||||
(swap! form assoc-in [:data :color-result] "")
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
(cond
|
||||
;; Untouched field (form just opened)
|
||||
(not touched?)
|
||||
(when-not error
|
||||
(swap! form assoc-in [:data :color-result] value)
|
||||
(when (csu/show-hint-on-open? (get-in @form [:data input-name]) value)
|
||||
(reset! hint* {:message (tr "workspace.tokens.resolved-value" (dwtf/format-token-value value))
|
||||
:type "hint"})))
|
||||
|
||||
(let [message (tr "workspace.tokens.resolved-value" (dwtf/format-token-value value))]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(swap! form assoc-in [:data :color-result] value)
|
||||
(reset! hint* {:message message :type "hint"}))))))))]
|
||||
error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] {:message error})
|
||||
(swap! form assoc-in [:data :color-result] "")
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
|
||||
:else
|
||||
(let [message (tr "workspace.tokens.resolved-value" (dwtf/format-token-value value))]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(swap! form assoc-in [:data :color-result] value)
|
||||
(reset! hint* {:message message :type "hint"})))))))]
|
||||
|
||||
(fn []
|
||||
(rx/dispose! subs))))
|
||||
|
||||
@ -285,16 +285,25 @@
|
||||
((:error/fn error) (:error/value error))))))
|
||||
(rx/subs! (fn [{:keys [error value]}]
|
||||
(let [touched? (get-in @form [:touched name])]
|
||||
(when touched?
|
||||
(if error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors name] {:message error})
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc name)
|
||||
(reset! hint* {:message message :type "hint"}))))))))]
|
||||
(cond
|
||||
;; Untouched field (form just opened)
|
||||
(not touched?)
|
||||
(when (and (not error)
|
||||
(csu/show-hint-on-open? (get-in @form [:data name]) value))
|
||||
(reset! hint* {:message (tr "workspace.tokens.resolved-value" value)
|
||||
:type "hint"}))
|
||||
|
||||
error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors name] {:message error})
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
|
||||
:else
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc name)
|
||||
(reset! hint* {:message message :type "hint"})))))))]
|
||||
(fn []
|
||||
(rx/dispose! subs))))
|
||||
|
||||
|
||||
@ -175,17 +175,26 @@
|
||||
(d/update-when result :error wte/resolve-error-assoc-message)))
|
||||
(rx/subs! (fn [{:keys [error value]}]
|
||||
(let [touched? (get-in @form [:touched input-name])]
|
||||
(when touched?
|
||||
(if error
|
||||
(let [error' (:message error)]
|
||||
(if (csu/group-name-conflict-error? error' token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] error')
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] error')
|
||||
(reset! hint* {:message error' :type "error"}))))
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(reset! hint* {:message message :type "hint"}))))))))]
|
||||
(cond
|
||||
;; Untouched field (form just opened)
|
||||
(not touched?)
|
||||
(when (and (not error)
|
||||
(csu/show-hint-on-open? (get-in @form [:data input-name]) value))
|
||||
(reset! hint* {:message (tr "workspace.tokens.resolved-value" value)
|
||||
:type "hint"}))
|
||||
|
||||
error
|
||||
(let [error' (:message error)]
|
||||
(if (csu/group-name-conflict-error? error' token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] error')
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] error')
|
||||
(reset! hint* {:message error' :type "error"}))))
|
||||
|
||||
:else
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(reset! hint* {:message message :type "hint"})))))))]
|
||||
(fn []
|
||||
(rx/dispose! subs))))
|
||||
|
||||
|
||||
@ -255,16 +255,25 @@
|
||||
(d/update-when result :error wte/resolve-error-message)))
|
||||
(rx/subs! (fn [{:keys [error value]}]
|
||||
(let [touched? (get-in @form [:touched input-name])]
|
||||
(when touched?
|
||||
(if error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] {:message error})
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(reset! hint* {:message message :type "hint"}))))))))]
|
||||
(cond
|
||||
;; Untouched field (form just opened)
|
||||
(not touched?)
|
||||
(when (and (not error)
|
||||
(csu/show-hint-on-open? (get-in @form [:data input-name]) value))
|
||||
(reset! hint* {:message (tr "workspace.tokens.resolved-value" value)
|
||||
:type "hint"}))
|
||||
|
||||
error
|
||||
(if (csu/group-name-conflict-error? error token-name)
|
||||
(swap! form assoc-in [:extra-errors ""] {:message error})
|
||||
(do
|
||||
(swap! form assoc-in [:extra-errors input-name] {:message error})
|
||||
(reset! hint* {:message error :type "error"})))
|
||||
|
||||
:else
|
||||
(let [message (tr "workspace.tokens.resolved-value" value)]
|
||||
(swap! form update :extra-errors dissoc input-name)
|
||||
(reset! hint* {:message message :type "hint"})))))))]
|
||||
|
||||
(fn []
|
||||
(rx/dispose! subs))))
|
||||
@ -309,7 +318,11 @@
|
||||
|
||||
resolve-stream
|
||||
(mf/with-memo [token]
|
||||
(if-let [value (get-in token [:value input-name])]
|
||||
;; An alias token keeps its reference as a plain string value
|
||||
(if-let [value (if (= input-name :reference)
|
||||
(let [value (:value token)]
|
||||
(when (string? value) value))
|
||||
(get-in token [:value input-name]))]
|
||||
(rx/behavior-subject value)
|
||||
(rx/subject)))
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
(:require
|
||||
[app.common.data.macros :as dm]
|
||||
[app.common.types.token :as cto]
|
||||
[app.main.data.workspace.tokens.format :as dwtf]
|
||||
[app.util.i18n :refer [tr]]
|
||||
[cuerdas.core :as str]))
|
||||
|
||||
@ -126,6 +127,14 @@
|
||||
(let [translated-string (tr "errors.tokens.name-collision" token-name)]
|
||||
(= error translated-string)))
|
||||
|
||||
(defn show-hint-on-open?
|
||||
"True when an untouched field (form just opened) shows the resolved
|
||||
value: only when it differs from the written one, so a plain `16`
|
||||
gets no `Resolved value: 16` hint."
|
||||
[input-value resolved-value]
|
||||
(not= (str/lower (str/trim (dwtf/format-token-value input-value)))
|
||||
(str/lower (str/trim (dwtf/format-token-value resolved-value)))))
|
||||
|
||||
(defn- referenced-token-name
|
||||
"Name of the token `reference` points to, when `reference` is exactly
|
||||
one `{name}` reference."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user