@shadow-js/web 1.0.3 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/README.md +2 -3
- package/dist/dev/attributes.js +1 -5
- package/dist/dev/attributes.js.map +1 -1
- package/dist/dev/class-style.js +9 -12
- package/dist/dev/class-style.js.map +1 -1
- package/dist/dev/element.js +8 -25
- package/dist/dev/element.js.map +1 -1
- package/dist/dev/events.js +64 -80
- package/dist/dev/events.js.map +1 -1
- package/dist/dev/insert.js +50 -68
- package/dist/dev/insert.js.map +1 -1
- package/dist/dev/internal/reconcile.d.ts +2 -1
- package/dist/dev/internal/reconcile.js +19 -2
- package/dist/dev/internal/reconcile.js.map +1 -1
- package/dist/dev/spread.js +47 -80
- package/dist/dev/spread.js.map +1 -1
- package/dist/prod/attributes.js +1 -1
- package/dist/prod/attributes.js.map +1 -1
- package/dist/prod/class-style.js +1 -1
- package/dist/prod/class-style.js.map +1 -1
- package/dist/prod/element.js +1 -1
- package/dist/prod/element.js.map +1 -1
- package/dist/prod/events.js +1 -1
- package/dist/prod/events.js.map +1 -1
- package/dist/prod/insert.js +1 -1
- package/dist/prod/insert.js.map +1 -1
- package/dist/prod/internal/reconcile.js +1 -1
- package/dist/prod/internal/reconcile.js.map +1 -1
- package/dist/prod/spread.js +1 -1
- package/dist/prod/spread.js.map +1 -1
- package/dist/server/attributes.js +1 -1
- package/dist/server/attributes.js.map +1 -1
- package/dist/server/class-style.js +1 -1
- package/dist/server/class-style.js.map +1 -1
- package/dist/server/element.js.map +1 -1
- package/dist/server/events.js +1 -1
- package/dist/server/events.js.map +1 -1
- package/dist/server/insert.js +1 -1
- package/dist/server/insert.js.map +1 -1
- package/dist/server/internal/reconcile.js +1 -1
- package/dist/server/internal/reconcile.js.map +1 -1
- package/dist/server/spread.js +1 -1
- package/dist/server/spread.js.map +1 -1
- package/dist/server-dev/attributes.js +1 -5
- package/dist/server-dev/attributes.js.map +1 -1
- package/dist/server-dev/class-style.js +9 -12
- package/dist/server-dev/class-style.js.map +1 -1
- package/dist/server-dev/element.js.map +1 -1
- package/dist/server-dev/events.js +64 -80
- package/dist/server-dev/events.js.map +1 -1
- package/dist/server-dev/insert.js +50 -68
- package/dist/server-dev/insert.js.map +1 -1
- package/dist/server-dev/internal/reconcile.js +19 -2
- package/dist/server-dev/internal/reconcile.js.map +1 -1
- package/dist/server-dev/spread.js +47 -80
- package/dist/server-dev/spread.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-style.js","names":[],"sources":["../../src/class-style.ts"],"sourcesContent":["import { leaves, unwrap } from \"./internal/accessor\";\nimport { cssValueText } from \"./internal/css-units\";\nimport { HTML_NS } from \"./internal/names\";\n\n/** `map` itself, or a copy in which accessor values are resolved, so a later diff compares what was applied. */\nfunction resolveMap(map: Record<string, unknown>): Record<string, unknown> {\n let out = map;\n for (const key of Object.keys(map)) {\n if (typeof map[key] !== \"function\") continue;\n if (out === map) out = { ...map };\n out[key] = unwrap(map[key]);\n }\n return out;\n}\n\n/** Appends the truthy class names of `value` (strings, numbers, nested arrays, objects) to `parts`. */\nfunction collectClasses(root: unknown, parts: string[]): void {\n const cycle = __DEV__ ? \"className(): a class array contains itself.\" : \"SHADOW_CLASS_CYCLE\";\n for (const item of leaves(root, cycle)) {\n if (typeof item === \"string\") {\n if (item !== \"\") parts.push(item);\n } else if (typeof item === \"number\") {\n if (item !== 0 && !Number.isNaN(item)) parts.push(String(item));\n } else if (item !== null && typeof item === \"object\") {\n const record = item as Record<string, unknown>;\n for (const key of Object.keys(record)) {\n if (unwrap(record[key]) && key !== \"\") parts.push(key);\n }\n }\n }\n}\n\n/** Class text for `value`, or null when the class attribute must be removed. */\nfunction classText(input: unknown): string | null {\n const value = unwrap(input);\n if (typeof value === \"string\") return value;\n if (value === null || value === undefined || value === false) return null;\n const parts: string[] = [];\n collectClasses(value, parts);\n return parts.join(\" \");\n}\n\n/**\n * Writes a class value. `svg` selects the attribute path, which SVG and MathML need because their\n * `className` is not a plain string.\n * @internal\n */\nexport function applyClass(el: Element, value: unknown, svg: boolean): void {\n const text = classText(value);\n if (text === null) {\n el.removeAttribute(\"class\");\n return;\n }\n if (svg) {\n if (el.getAttribute(\"class\") !== text) el.setAttribute(\"class\", text);\n } else if (el.className !== text) {\n el.className = text;\n }\n}\n\n/**\n * Replaces the whole `class` of an element: the helper compiled templates call for `class` and\n * `className`. HTML elements are written through `className`; SVG and MathML elements (whose\n * `className` is not a plain string) through the `class` attribute. The DOM is touched only when\n * the text changes.\n *\n * @param el Target element.\n * @param value A string is used as is. Arrays and objects are clsx-style: non-empty strings,\n * numbers other than `0` and `NaN`, nested arrays, and the keys of objects whose value is truthy,\n * joined with spaces. `null`, `undefined` and `false` remove the attribute. Accessors, also inside\n * arrays and as object values, are called (as on the server); the signals they read are tracked by\n * the effect that applies the class.\n * @throws TypeError `SHADOW_CLASS_CYCLE` when an array contains itself (directly or through a nested\n * array), and `SHADOW_INSERT_DEPTH` when an accessor returns accessors more than 10,000 levels deep.\n * @example\n * import { className } from \"@shadow-js/web\";\n *\n * const card = document.createElement(\"div\");\n * className(card, [\"card\", { \"card--active\": true, \"card--muted\": false }]);\n * card.className; // \"card card--active\"\n * @see classList\n * @since 1.0.0\n */\nexport function className(el: Element, value: unknown): void {\n applyClass(el, value, el.namespaceURI !== HTML_NS);\n}\n\n/** Narrows an object value to a record of keys; arrays and primitives are not class maps. @internal */\nexport function asRecord(value: unknown): Record<string, unknown> | undefined {\n if (value === null || typeof value !== \"object\" || Array.isArray(value)) return undefined;\n return value as Record<string, unknown>;\n}\n\n/** Whether `key` is switched on in `map`: own properties only, so a key named `constructor` reads as it was written. */\nfunction enabled(map: Record<string, unknown>, key: string): boolean {\n return Object.hasOwn(map, key) && Boolean(map[key]);\n}\n\n/**\n * Toggles individual classes from an object: the helper compiled templates call for `classList`.\n * Unlike {@link className}, it leaves classes it did not set alone: only keys whose truthiness\n * changed relative to `prev` are touched. A key may hold several space-separated names. Keys that\n * disappeared from `value` are switched off.\n *\n * @param el Target element.\n * @param value Map from class names to truthiness; a value that is an accessor is called. `undefined`\n * switches off every class `prev` had on.\n * @param prev The map returned by the previous call. Undefined (the first call) means no class was\n * on yet.\n * @returns The map now in effect (`value`, or `{}` for undefined; a copy with the accessors resolved\n * when `value` has any), to pass back as `prev` next time.\n * @example\n * import { classList } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"li\");\n * let prev = classList(el, { active: true, \"is-new pulse\": true });\n * prev = classList(el, { active: false }, prev); // removes active, is-new and pulse\n * @see className\n * @since 1.0.0\n */\nexport function classList(\n el: Element,\n value: Record<string, unknown> | undefined,\n prev?: Record<string, unknown>,\n): Record<string, unknown> {\n const next = resolveMap(value ?? {});\n const before: Record<string, unknown> = prev ?? {};\n const keys = new Set([...Object.keys(before), ...Object.keys(next)]);\n for (const key of keys) {\n // Own properties only: `next[\"constructor\"]` would otherwise read Object.prototype's function\n // and a class with that name could never be switched on.\n const now = enabled(next, key);\n const was = enabled(before, key);\n if (now === was) continue;\n for (const token of key.split(/\\s+/)) {\n if (token !== \"\") el.classList.toggle(token, now);\n }\n }\n return next;\n}\n\n/**\n * Converts a camelCase style name to a CSS property name. Custom properties are kept as they are,\n * and vendor prefixes map to `-webkit-` and `-ms-`.\n * @internal\n */\nexport function toCssProperty(name: string): string {\n if (name.startsWith(\"--\")) return name;\n const kebab = name.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);\n return kebab.startsWith(\"ms-\") ? `-${kebab}` : kebab;\n}\n\n/**\n * Sets or removes one inline style property: the helper compiled templates call for the `style:`\n * prefix. Other inline properties are left alone.\n *\n * @param el HTML or SVG element.\n * @param name CSS property in camelCase (`backgroundColor`, `msTransform` gives `-ms-transform`) or\n * kebab-case, or a custom property (`--accent`, kept as is).\n * @param value `null`, `undefined` and `false` remove the property. A number is in pixels, as in\n * React, unless it is `0`, the property is unitless (`opacity`, `zIndex`, `flexGrow`, `lineHeight`,\n * ...) or a custom property. Any other value is written as `String(value)`.\n * @example\n * import { setStyleProperty } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"div\");\n * setStyleProperty(el, \"marginTop\", 8); // margin-top: 8px\n * setStyleProperty(el, \"--accent\", \"rebeccapurple\");\n * setStyleProperty(el, \"opacity\", 0.5); // unitless\n * @see style\n * @since 1.0.0\n */\nexport function setStyleProperty(el: HTMLElement | SVGElement, name: string, value: unknown): void {\n const property = toCssProperty(name);\n if (value === null || value === undefined || value === false) {\n el.style.removeProperty(property);\n } else {\n el.style.setProperty(property, cssValueText(property, value));\n }\n}\n\n/**\n * Sets the inline style of an element: the helper compiled templates call for a `style` attribute.\n * An object is diffed against `prev` so that only changed properties are written, each with the\n * rules of {@link setStyleProperty}; properties that disappeared are removed.\n *\n * @param el HTML or SVG element.\n * @param value An object of properties (camelCase, kebab-case or custom names). A string replaces\n * `cssText`. An array of strings and objects (not nested; `null`, `undefined`, `false` and `\"\"`\n * items are skipped) is written in order, so a later declaration wins, exactly as `ssrStyle` writes it\n * on the server. `null`, `undefined` and `false` remove the `style` attribute. Accessors (the value,\n * array items and property values) are called, as on the server.\n * @param prev The value returned by the previous call. Undefined (the first call) diffs against an\n * empty style. When it is a string or an array, `cssText` is cleared before the object is written.\n * @returns What to pass back as `prev` next time: a shallow copy of an object value, otherwise\n * `value` itself.\n * @throws TypeError (production message `SHADOW_STYLE_ITEM`) when an array holds a nested array or a\n * value that is not a string or an object.\n * @example\n * import { style } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"div\");\n * let prev = style(el, { color: \"red\", width: 120 }); // width: 120px\n * prev = style(el, { color: \"blue\" }, prev); // writes color, removes width\n * @see setStyleProperty\n * @since 1.0.0\n */\nexport function style(el: HTMLElement | SVGElement, value: unknown, prev?: unknown): unknown {\n const resolved = unwrap(value);\n if (resolved === null || resolved === undefined || resolved === false) {\n el.removeAttribute(\"style\");\n return resolved;\n }\n if (typeof resolved !== \"object\") {\n el.style.cssText = String(resolved);\n return resolved;\n }\n if (Array.isArray(resolved)) {\n // Not diffed: a string in the array can set any property, so the whole style is written again, in\n // order (a later declaration wins, as on the server).\n el.style.cssText = \"\";\n for (const source of resolved) {\n const item = unwrap(source);\n if (typeof item === \"string\") {\n el.style.cssText += `;${item}`;\n } else if (item !== null && item !== undefined && item !== false) {\n if (typeof item !== \"object\" || Array.isArray(item)) {\n throw new TypeError(\n __DEV__ ? \"style(): an array holds only strings and objects.\" : \"SHADOW_STYLE_ITEM\",\n );\n }\n style(el, item, {});\n }\n }\n return resolved;\n }\n const next = resolveMap({ ...(resolved as Record<string, unknown>) });\n const before = asRecord(prev) ?? {};\n // What a string or an array wrote is unknown, so it is cleared before the object is written.\n if (typeof prev === \"string\" || Array.isArray(prev)) el.style.cssText = \"\";\n const keys = new Set([...Object.keys(before), ...Object.keys(next)]);\n for (const key of keys) {\n if (Object.is(before[key], next[key])) continue;\n setStyleProperty(el, key, next[key]);\n }\n return next;\n}\n"],"mappings":";;;;;AAKA,SAAS,WAAW,KAAuD;CACzE,IAAI,MAAM;CACV,KAAK,MAAM,OAAO,OAAO,KAAK,GAAG,GAAG;EAClC,IAAI,OAAO,IAAI,SAAS,YAAY;EACpC,IAAI,QAAQ,KAAK,MAAM,EAAE,GAAG,IAAI;EAChC,IAAI,OAAO,OAAO,IAAI,IAAI;CAC5B;CACA,OAAO;AACT;;AAGA,SAAS,eAAe,MAAe,OAAuB;CAE5D,KAAK,MAAM,QAAQ,OAAO,MAAM,6CAAK,GACnC,IAAI,OAAO,SAAS,UACd;MAAA,SAAS,IAAI,MAAM,KAAK,IAAI;CAAA,OAC3B,IAAI,OAAO,SAAS,UACrB;MAAA,SAAS,KAAK,CAAC,OAAO,MAAM,IAAI,GAAG,MAAM,KAAK,OAAO,IAAI,CAAC;CAAA,OACzD,IAAI,SAAS,QAAQ,OAAO,SAAS,UAAU;EACpD,MAAM,SAAS;EACf,KAAK,MAAM,OAAO,OAAO,KAAK,MAAM,GAClC,IAAI,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,KAAK,GAAG;CAEzD;AAEJ;;AAGA,SAAS,UAAU,OAA+B;CAChD,MAAM,QAAQ,OAAO,KAAK;CAC1B,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,UAAU,QAAQ,UAAU,KAAA,KAAa,UAAU,OAAO,OAAO;CACrE,MAAM,QAAkB,CAAC;CACzB,eAAe,OAAO,KAAK;CAC3B,OAAO,MAAM,KAAK,GAAG;AACvB;;;;;;AAOA,SAAgB,WAAW,IAAa,OAAgB,KAAoB;CAC1E,MAAM,OAAO,UAAU,KAAK;CAC5B,IAAI,SAAS,MAAM;EACjB,GAAG,gBAAgB,OAAO;EAC1B;CACF;CACA,IAAI,KACE;MAAA,GAAG,aAAa,OAAO,MAAM,MAAM,GAAG,aAAa,SAAS,IAAI;CAAA,OAC/D,IAAI,GAAG,cAAc,MAC1B,GAAG,YAAY;AAEnB;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,SAAgB,UAAU,IAAa,OAAsB;CAC3D,WAAW,IAAI,OAAO,GAAG,iBAAiB,OAAO;AACnD;;AAGA,SAAgB,SAAS,OAAqD;CAC5E,IAAI,UAAU,QAAQ,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG,OAAO,KAAA;CAChF,OAAO;AACT;;AAGA,SAAS,QAAQ,KAA8B,KAAsB;CACnE,OAAO,OAAO,OAAO,KAAK,GAAG,KAAK,QAAQ,IAAI,IAAI;AACpD;;;;;;;;;;;;;;;;;;;;;;;AAwBA,SAAgB,UACd,IACA,OACA,MACyB;CACzB,MAAM,OAAO,WAAW,SAAS,CAAC,CAAC;CACnC,MAAM,SAAkC,QAAQ,CAAC;CACjD,MAAM,uBAAO,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,MAAM,GAAG,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC;CACnE,KAAK,MAAM,OAAO,MAAM;EAGtB,MAAM,MAAM,QAAQ,MAAM,GAAG;EAE7B,IAAI,QADQ,QAAQ,QAAQ,GACd,GAAG;EACjB,KAAK,MAAM,SAAS,IAAI,MAAM,KAAK,GACjC,IAAI,UAAU,IAAI,GAAG,UAAU,OAAO,OAAO,GAAG;CAEpD;CACA,OAAO;AACT;;;;;;AAOA,SAAgB,cAAc,MAAsB;CAClD,IAAI,KAAK,WAAW,IAAI,GAAG,OAAO;CAClC,MAAM,QAAQ,KAAK,QAAQ,WAAW,WAAW,IAAI,OAAO,YAAY,GAAG;CAC3E,OAAO,MAAM,WAAW,KAAK,IAAI,IAAI,UAAU;AACjD;;;;;;;;;;;;;;;;;;;;;AAsBA,SAAgB,iBAAiB,IAA8B,MAAc,OAAsB;CACjG,MAAM,WAAW,cAAc,IAAI;CACnC,IAAI,UAAU,QAAQ,UAAU,KAAA,KAAa,UAAU,OACrD,GAAG,MAAM,eAAe,QAAQ;MAEhC,GAAG,MAAM,YAAY,UAAU,aAAa,UAAU,KAAK,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,SAAgB,MAAM,IAA8B,OAAgB,MAAyB;CAC3F,MAAM,WAAW,OAAO,KAAK;CAC7B,IAAI,aAAa,QAAQ,aAAa,KAAA,KAAa,aAAa,OAAO;EACrE,GAAG,gBAAgB,OAAO;EAC1B,OAAO;CACT;CACA,IAAI,OAAO,aAAa,UAAU;EAChC,GAAG,MAAM,UAAU,OAAO,QAAQ;EAClC,OAAO;CACT;CACA,IAAI,MAAM,QAAQ,QAAQ,GAAG;EAG3B,GAAG,MAAM,UAAU;EACnB,KAAK,MAAM,UAAU,UAAU;GAC7B,MAAM,OAAO,OAAO,MAAM;GAC1B,IAAI,OAAO,SAAS,UAClB,GAAG,MAAM,WAAW,IAAI;QACnB,IAAI,SAAS,QAAQ,SAAS,KAAA,KAAa,SAAS,OAAO;IAChE,IAAI,OAAO,SAAS,YAAY,MAAM,QAAQ,IAAI,GAChD,MAAM,IAAI,UACE,mDACZ;IAEF,MAAM,IAAI,MAAM,CAAC,CAAC;GACpB;EACF;EACA,OAAO;CACT;CACA,MAAM,OAAO,WAAW,EAAE,GAAI,SAAqC,CAAC;CACpE,MAAM,SAAS,SAAS,IAAI,KAAK,CAAC;CAElC,IAAI,OAAO,SAAS,YAAY,MAAM,QAAQ,IAAI,GAAG,GAAG,MAAM,UAAU;CACxE,MAAM,uBAAO,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,MAAM,GAAG,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC;CACnE,KAAK,MAAM,OAAO,MAAM;EACtB,IAAI,OAAO,GAAG,OAAO,MAAM,KAAK,IAAI,GAAG;EACvC,iBAAiB,IAAI,KAAK,KAAK,IAAI;CACrC;CACA,OAAO;AACT"}
|
|
1
|
+
{"version":3,"file":"class-style.js","names":[],"sources":["../../src/class-style.ts"],"sourcesContent":["import { leaves, unwrap } from \"./internal/accessor\";\nimport { cssValueText } from \"./internal/css-units\";\nimport { HTML_NS } from \"./internal/names\";\n\n/** Appends the truthy class names of `value` (strings, numbers, nested arrays, objects) to `parts`. */\nfunction collectClasses(root: unknown, parts: string[]): void {\n const cycle = __DEV__ ? \"className(): a class array contains itself.\" : \"SHADOW_CLASS_CYCLE\";\n for (const item of leaves(root, cycle)) {\n if (typeof item === \"string\") {\n if (item !== \"\") parts.push(item);\n } else if (typeof item === \"number\") {\n if (item !== 0 && !Number.isNaN(item)) parts.push(String(item));\n } else if (item !== null && typeof item === \"object\") {\n const record = item as Record<string, unknown>;\n for (const key of Object.keys(record)) {\n if (unwrap(record[key]) && key !== \"\") parts.push(key);\n }\n }\n }\n}\n\n/** Class text for `value`, or null when the class attribute must be removed. */\nfunction classText(input: unknown): string | null {\n const value = unwrap(input);\n if (typeof value === \"string\") return value;\n if (value === null || value === undefined || value === false) return null;\n const parts: string[] = [];\n collectClasses(value, parts);\n return parts.join(\" \");\n}\n\n/**\n * Writes a class value. `svg` selects the attribute path, which SVG and MathML need because their\n * `className` is not a plain string.\n * @internal\n */\nexport function applyClass(el: Element, value: unknown, svg: boolean): void {\n const text = classText(value);\n if (text === null) {\n el.removeAttribute(\"class\");\n return;\n }\n if (svg) {\n if (el.getAttribute(\"class\") !== text) el.setAttribute(\"class\", text);\n } else if (el.className !== text) {\n el.className = text;\n }\n}\n\n/**\n * Replaces the whole `class` of an element: the helper compiled templates call for `class` and\n * `className`. HTML elements are written through `className`; SVG and MathML elements (whose\n * `className` is not a plain string) through the `class` attribute. The DOM is touched only when\n * the text changes.\n *\n * @param el Target element.\n * @param value A string is used as is. Arrays and objects are clsx-style: non-empty strings,\n * numbers other than `0` and `NaN`, nested arrays, and the keys of objects whose value is truthy,\n * joined with spaces. `null`, `undefined` and `false` remove the attribute. Accessors, also inside\n * arrays and as object values, are called (as on the server); the signals they read are tracked by\n * the effect that applies the class.\n * @throws TypeError `SHADOW_CLASS_CYCLE` when an array contains itself (directly or through a nested\n * array), and `SHADOW_INSERT_DEPTH` when an accessor returns accessors more than 10,000 levels deep.\n * @example\n * import { className } from \"@shadow-js/web\";\n *\n * const card = document.createElement(\"div\");\n * className(card, [\"card\", { \"card--active\": true, \"card--muted\": false }]);\n * card.className; // \"card card--active\"\n * @see classList\n * @since 1.0.0\n */\nexport function className(el: Element, value: unknown): void {\n applyClass(el, value, el.namespaceURI !== HTML_NS);\n}\n\n/** Narrows an object value to a record of keys; arrays and primitives are not class maps. @internal */\nexport function asRecord(value: unknown): Record<string, unknown> | undefined {\n if (value === null || typeof value !== \"object\" || Array.isArray(value)) return undefined;\n return value as Record<string, unknown>;\n}\n\n/** Whether `key` is switched on in `map`: own properties only, so a key named `constructor` reads as it was written. */\nfunction enabled(map: Record<string, unknown>, key: string): boolean {\n return Object.hasOwn(map, key) && Boolean(map[key]);\n}\n\n/**\n * Toggles individual classes from an object: the helper compiled templates call for `classList`.\n * Unlike {@link className}, it leaves classes it did not set alone: only keys whose truthiness\n * changed relative to `prev` are touched. A key may hold several space-separated names. Keys that\n * disappeared from `value` are switched off.\n *\n * @param el Target element.\n * @param value Map from class names to truthiness; a value that is an accessor is called. `undefined`\n * switches off every class `prev` had on.\n * @param prev The map returned by the previous call. Undefined (the first call) means no class was\n * on yet.\n * @returns The map now in effect (`value`, or `{}` for undefined; a copy with the accessors resolved\n * when `value` has any), to pass back as `prev` next time.\n * @example\n * import { classList } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"li\");\n * let prev = classList(el, { active: true, \"is-new pulse\": true });\n * prev = classList(el, { active: false }, prev); // removes active, is-new and pulse\n * @see className\n * @since 1.0.0\n */\nexport function classList(\n el: Element,\n value: Record<string, unknown> | undefined,\n prev?: Record<string, unknown>,\n): Record<string, unknown> {\n // `value` itself, or a copy in which accessor values are resolved, so a later diff compares what was applied.\n const source = value ?? {};\n let next = source;\n for (const key of Object.keys(source)) {\n if (typeof source[key] !== \"function\") continue;\n if (next === source) next = { ...source };\n next[key] = unwrap(source[key]);\n }\n const before: Record<string, unknown> = prev ?? {};\n const keys = new Set([...Object.keys(before), ...Object.keys(next)]);\n for (const key of keys) {\n // Own properties only: `next[\"constructor\"]` would otherwise read Object.prototype's function\n // and a class with that name could never be switched on.\n const now = enabled(next, key);\n const was = enabled(before, key);\n if (now === was) continue;\n for (const token of key.split(/\\s+/)) {\n if (token !== \"\") el.classList.toggle(token, now);\n }\n }\n return next;\n}\n\n/**\n * Converts a camelCase style name to a CSS property name. Custom properties are kept as they are,\n * and vendor prefixes map to `-webkit-` and `-ms-`.\n * @internal\n */\nexport function toCssProperty(name: string): string {\n if (name.startsWith(\"--\")) return name;\n const kebab = name.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);\n return kebab.startsWith(\"ms-\") ? `-${kebab}` : kebab;\n}\n\n/**\n * Sets or removes one inline style property: the helper compiled templates call for the `style:`\n * prefix. Other inline properties are left alone.\n *\n * @param el HTML or SVG element.\n * @param name CSS property in camelCase (`backgroundColor`, `msTransform` gives `-ms-transform`) or\n * kebab-case, or a custom property (`--accent`, kept as is).\n * @param value `null`, `undefined` and `false` remove the property. A number is in pixels, as in\n * React, unless it is `0`, the property is unitless (`opacity`, `zIndex`, `flexGrow`, `lineHeight`,\n * ...) or a custom property. Any other value is written as `String(value)`.\n * @example\n * import { setStyleProperty } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"div\");\n * setStyleProperty(el, \"marginTop\", 8); // margin-top: 8px\n * setStyleProperty(el, \"--accent\", \"rebeccapurple\");\n * setStyleProperty(el, \"opacity\", 0.5); // unitless\n * @see style\n * @since 1.0.0\n */\nexport function setStyleProperty(el: HTMLElement | SVGElement, name: string, value: unknown): void {\n const property = toCssProperty(name);\n if (value === null || value === undefined || value === false) {\n el.style.removeProperty(property);\n } else {\n el.style.setProperty(property, cssValueText(property, value));\n }\n}\n\n/**\n * Sets the inline style of an element: the helper compiled templates call for a `style` attribute.\n * An object is diffed against `prev` so that only changed properties are written, each with the\n * rules of {@link setStyleProperty}; properties that disappeared are removed.\n *\n * @param el HTML or SVG element.\n * @param value An object of properties (camelCase, kebab-case or custom names). A string replaces\n * `cssText`. An array of strings and objects (not nested; `null`, `undefined`, `false` and `\"\"`\n * items are skipped) is written in order, so a later declaration wins, exactly as `ssrStyle` writes it\n * on the server. `null`, `undefined` and `false` remove the `style` attribute. Accessors (the value,\n * array items and property values) are called, as on the server.\n * @param prev The value returned by the previous call. Undefined (the first call) diffs against an\n * empty style. When it is a string or an array, `cssText` is cleared before the object is written.\n * @returns What to pass back as `prev` next time: a shallow copy of an object value, otherwise\n * `value` itself.\n * @throws TypeError (production message `SHADOW_STYLE_ITEM`) when an array holds a nested array or a\n * value that is not a string or an object.\n * @example\n * import { style } from \"@shadow-js/web\";\n *\n * const el = document.createElement(\"div\");\n * let prev = style(el, { color: \"red\", width: 120 }); // width: 120px\n * prev = style(el, { color: \"blue\" }, prev); // writes color, removes width\n * @see setStyleProperty\n * @since 1.0.0\n */\nexport function style(el: HTMLElement | SVGElement, value: unknown, prev?: unknown): unknown {\n const resolved = unwrap(value);\n if (resolved === null || resolved === undefined || resolved === false) {\n el.removeAttribute(\"style\");\n return resolved;\n }\n if (typeof resolved !== \"object\") {\n el.style.cssText = String(resolved);\n return resolved;\n }\n if (Array.isArray(resolved)) {\n // Not diffed: a string in the array can set any property, so the whole style is written again, in\n // order (a later declaration wins, as on the server).\n el.style.cssText = \"\";\n for (const source of resolved) {\n const item = unwrap(source);\n if (typeof item === \"string\") {\n el.style.cssText += `;${item}`;\n } else if (item !== null && item !== undefined && item !== false) {\n if (typeof item !== \"object\" || Array.isArray(item)) {\n throw new TypeError(\n __DEV__ ? \"style(): an array holds only strings and objects.\" : \"SHADOW_STYLE_ITEM\",\n );\n }\n style(el, item, {});\n }\n }\n return resolved;\n }\n const next: Record<string, unknown> = { ...(resolved as Record<string, unknown>) };\n for (const key of Object.keys(next)) next[key] = unwrap(next[key]);\n const before = asRecord(prev) ?? {};\n // What a string or an array wrote is unknown, so it is cleared before the object is written.\n if (typeof prev === \"string\" || Array.isArray(prev)) el.style.cssText = \"\";\n const keys = new Set([...Object.keys(before), ...Object.keys(next)]);\n for (const key of keys) {\n if (Object.is(before[key], next[key])) continue;\n setStyleProperty(el, key, next[key]);\n }\n return next;\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.js","names":[],"sources":["../../src/element.ts"],"sourcesContent":["import { batch, untrack, useRenderEffect } from \"@shadow-js/core\";\nimport { setAttribute, setBoolAttribute } from \"./attributes\";\nimport { style } from \"./class-style\";\nimport { insert } from \"./insert\";\nimport { checkClaimedTag } from \"./internal/claim\";\nimport { claims } from \"./internal/hydration-hooks\";\nimport { nextKey } from \"./internal/hydration-scope\";\nimport { isFlagAttribute } from \"./internal/react-names\";\nimport { ssrElement, ssrRaw } from \"./server/element\";\nimport { isTextOnlyElement } from \"./server/raw-text\";\n\n/**\n * The slim element primitive: one HTML element with attributes, event listeners, `ref` and children,\n * and no generic prop runtime. `Dynamic` and `spread` cover every prop shape; this covers the common\n * ones, so a library that renders one fixed element (a link, a button) pays for what it binds.\n *\n * It keeps the renderer's contracts: the hydration key is drawn when the element is created, so it\n * claims the server's element and adopts its children; on the server it writes the same markup `Dynamic`\n * writes for the tag.\n */\n\n/** Tag shape that `Dynamic` accepts. `script` is refused for the same reason. */\nconst TAG_PATTERN = /^[a-z][a-z0-9-]*$/i;\n\n
|
|
1
|
+
{"version":3,"file":"element.js","names":[],"sources":["../../src/element.ts"],"sourcesContent":["import { batch, untrack, useRenderEffect } from \"@shadow-js/core\";\nimport { setAttribute, setBoolAttribute } from \"./attributes\";\nimport { style } from \"./class-style\";\nimport { insert } from \"./insert\";\nimport { checkClaimedTag } from \"./internal/claim\";\nimport { claims } from \"./internal/hydration-hooks\";\nimport { nextKey } from \"./internal/hydration-scope\";\nimport { isFlagAttribute } from \"./internal/react-names\";\nimport { ssrElement, ssrRaw } from \"./server/element\";\nimport { isTextOnlyElement } from \"./server/raw-text\";\n\n/**\n * The slim element primitive: one HTML element with attributes, event listeners, `ref` and children,\n * and no generic prop runtime. `Dynamic` and `spread` cover every prop shape; this covers the common\n * ones, so a library that renders one fixed element (a link, a button) pays for what it binds.\n *\n * It keeps the renderer's contracts: the hydration key is drawn when the element is created, so it\n * claims the server's element and adopts its children; on the server it writes the same markup `Dynamic`\n * writes for the tag.\n */\n\n/** Tag shape that `Dynamic` accepts. `script` is refused for the same reason. */\nconst TAG_PATTERN = /^[a-z][a-z0-9-]*$/i;\n\n/**\n * Creates one HTML element from a tag name and a props object, without the generic prop runtime of\n * `spread` and `Dynamic`: for a library that renders one fixed element (a link, a button) and wants\n * to pay only for what it binds. It draws a hydration key, so during `hydrate()` it adopts the\n * server's element and its children; on the server it returns the markup `Dynamic` writes for the tag.\n *\n * Each prop other than `children`, `ref` and `onX` is read in a render effect, so a getter prop\n * updates the element in place. `class` and the other attributes follow {@link setAttribute} (URL\n * attributes that would run script are refused); `style` follows {@link style}. Use `Dynamic` when the\n * tag is not known in advance, or for SVG, `classList`, delegated events or React prop names.\n *\n * @param tag An HTML tag name matching `[a-z][a-z0-9-]*` (any case), such as `\"a\"`. `script` is\n * refused.\n * @param props The element's props. `onX` keys whose third letter is uppercase are native listeners,\n * read once: the rest of the key lowercased is the event (`onClick` is `click`), and the value is a\n * function (called with the element as `this`) or a `[fn, data]` tuple (called as `fn(data, event)`);\n * handlers run batched and untracked. `ref` is called once with the element. `children` is inserted\n * (a getter keeps it reactive). `class` takes a string; `style` a string or an object.\n * @returns The element on the client; its server markup when rendering on the server.\n * @throws TypeError `SHADOW_ELEMENT_TAG` when `tag` is not an allowed tag name.\n * @example\n * import { useSignal } from \"@shadow-js/core\";\n * import { element } from \"@shadow-js/web\";\n *\n * function HomeLink() {\n * const [active] = useSignal(true);\n * return element(\"a\", {\n * href: \"/\",\n * get \"aria-current\"() { return active() ? \"page\" : undefined; },\n * onClick: (event: MouseEvent) => console.log(event.type),\n * children: \"Home\",\n * });\n * }\n * @see spread\n * @since 1.0.0\n */\nexport function element(tag: string, props: object): unknown {\n if (!TAG_PATTERN.test(tag) || tag.toLowerCase() === \"script\") {\n throw new TypeError(__DEV__ ? \"ShadowJS element: invalid tag\" : \"SHADOW_ELEMENT_TAG\");\n }\n const read = props as Readonly<Record<string, unknown>>;\n if (__SERVER__) {\n // The children are read after the hydration key is drawn, in the order the client claims them.\n return ssrElement(\n tag,\n props,\n () => {\n const children = read[\"children\"];\n // The content of a style or a title is text the parser reads whole: no markers can go in it.\n if (children === undefined || isTextOnlyElement(tag)) return children;\n return [ssrRaw(\"<!--[-->\"), children, ssrRaw(\"<!--]-->\")];\n },\n true,\n );\n }\n const claimed = claims.current.claimElement(nextKey());\n if (claimed !== null && __DEV__) checkClaimedTag(claimed, tag);\n const el = claimed ?? document.createElement(tag);\n for (const key of Object.keys(props)) {\n if (key === \"children\" || key === \"ref\") continue;\n if (/^on[A-Z]/.test(key)) {\n // Binds one listener, read once. A function runs with the element as `this`; a `[fn, data]` tuple\n // receives `data` first. `null`, `undefined` and `false` bind nothing. Handlers run in a batch and\n // untracked, as the event binding of `Dynamic` runs them.\n const handler = read[key];\n const tuple = Array.isArray(handler);\n // The tuple's data is read once, at bind time, like the handler.\n const [fn, data]: readonly unknown[] = tuple ? handler : [handler];\n if (typeof fn === \"function\") {\n el.addEventListener(key.slice(2).toLowerCase(), (event: Event): void => {\n batch(() => untrack(() => (tuple ? fn.call(el, data, event) : fn.call(el, event))));\n });\n }\n } else if (key === \"style\") {\n // The last value written, so a property that leaves the style object is removed (as spread does).\n let applied: unknown;\n useRenderEffect(\n () => read[key],\n (value) => {\n applied = style(el as HTMLElement, value, applied);\n },\n );\n } else {\n useRenderEffect(\n () => read[key],\n (value) => {\n // The server writes a boolean attribute by truthiness; the client does the same. A name\n // that is a flag has no React spelling, so lower case is its attribute name.\n const name = key.toLowerCase();\n if (isFlagAttribute(name, value)) setBoolAttribute(el, name, value);\n else setAttribute(el, key, value);\n },\n );\n }\n }\n const ref = read[\"ref\"];\n if (typeof ref === \"function\") untrack(() => ref(el));\n insert(el, () => read[\"children\"]);\n return el;\n}\n"],"mappings":";;;;;;;;;;;;;;AAsBA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsCpB,SAAgB,QAAQ,KAAa,OAAwB;CAC3D,IAAI,CAAC,YAAY,KAAK,GAAG,KAAK,IAAI,YAAY,MAAM,UAClD,MAAM,IAAI,UAAoB,+BAAsD;CAEtF,MAAM,OAAO;CAGX,OAAO,WACL,KACA,aACM;EACJ,MAAM,WAAW,KAAK;EAEtB,IAAI,aAAa,KAAA,KAAa,kBAAkB,GAAG,GAAG,OAAO;EAC7D,OAAO;GAAC,OAAO,UAAU;GAAG;GAAU,OAAO,UAAU;EAAC;CAC1D,GACA,IACF;AA8CJ"}
|
|
@@ -7,77 +7,60 @@ import { batch, getOwner, onCleanup, untrack } from "@shadow-js/core";
|
|
|
7
7
|
const DELEGATED_EVENTS = /^(?:click|dblclick|input|beforeinput|contextmenu|key(?:down|up|press)|(?:pointer|mouse)(?:down|up|move|over|out)|focus(?:in|out)|touch(?:start|end|move))$/;
|
|
8
8
|
/** Documents that already carry the delegated listener for a given event name. */
|
|
9
9
|
const installed = /* @__PURE__ */ new WeakMap();
|
|
10
|
-
/** Calls `fn` with `this` = node, retargeting `currentTarget` for the duration of the call. */
|
|
11
|
-
function invoke(fn, node, event, args) {
|
|
12
|
-
Object.defineProperty(event, "currentTarget", {
|
|
13
|
-
configurable: true,
|
|
14
|
-
get: () => node
|
|
15
|
-
});
|
|
16
|
-
try {
|
|
17
|
-
untrack(() => fn.call(node, ...args));
|
|
18
|
-
} finally {
|
|
19
|
-
Reflect.deleteProperty(event, "currentTarget");
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
10
|
/**
|
|
23
11
|
* The one listener per (document, event). It walks `composedPath()` from the target outward,
|
|
24
|
-
* calling `node.$$<type>` with `this = node
|
|
12
|
+
* calling `node.$$<type>` with `this = node` and `currentTarget` retargeted to the node for the
|
|
13
|
+
* duration of the call. Stops when a handler stops propagation.
|
|
25
14
|
*/
|
|
26
15
|
function dispatchDelegated(event) {
|
|
27
|
-
batch(() =>
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
16
|
+
batch(() => {
|
|
17
|
+
const key = `$$${event.type}`;
|
|
18
|
+
const dataKey = `${key}Data`;
|
|
19
|
+
const errors = [];
|
|
20
|
+
for (const node of event.composedPath()) {
|
|
21
|
+
if (event.cancelBubble) break;
|
|
22
|
+
const fn = Reflect.get(node, key);
|
|
23
|
+
if (typeof fn !== "function") continue;
|
|
24
|
+
const data = Reflect.get(node, dataKey);
|
|
25
|
+
try {
|
|
26
|
+
Object.defineProperty(event, "currentTarget", {
|
|
27
|
+
configurable: true,
|
|
28
|
+
get: () => node
|
|
29
|
+
});
|
|
30
|
+
untrack(() => fn.call(node, ...data === void 0 ? [event] : [data, event]));
|
|
31
|
+
} catch (error) {
|
|
32
|
+
errors.push(error);
|
|
33
|
+
} finally {
|
|
34
|
+
Reflect.deleteProperty(event, "currentTarget");
|
|
35
|
+
}
|
|
42
36
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
37
|
+
const [first] = errors;
|
|
38
|
+
if (errors.length === 1) throw first;
|
|
39
|
+
if (errors.length > 1) throw new AggregateError(errors, "Several event handlers threw.");
|
|
40
|
+
});
|
|
47
41
|
}
|
|
48
42
|
function isListenerObject(handler) {
|
|
49
43
|
return typeof handler === "object" && handler !== null && typeof handler.handleEvent === "function";
|
|
50
44
|
}
|
|
51
|
-
/**
|
|
52
|
-
function
|
|
53
|
-
const { once, passive, signal } = object;
|
|
54
|
-
const options = {
|
|
55
|
-
capture: object.capture === true || capture,
|
|
56
|
-
once,
|
|
57
|
-
passive,
|
|
58
|
-
signal
|
|
59
|
-
};
|
|
45
|
+
/** Adds a native listener that runs `run` untracked in one batch; returns the function that removes it. */
|
|
46
|
+
function listen(el, name, run, options) {
|
|
60
47
|
const listener = (event) => {
|
|
61
|
-
batch(() => untrack(() =>
|
|
48
|
+
batch(() => untrack(() => run(event)));
|
|
62
49
|
};
|
|
63
50
|
el.addEventListener(name, listener, options);
|
|
64
51
|
return () => {
|
|
65
52
|
el.removeEventListener(name, listener, options);
|
|
66
53
|
};
|
|
67
54
|
}
|
|
68
|
-
/**
|
|
69
|
-
function
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
data: handler[1],
|
|
78
|
-
tuple: true
|
|
79
|
-
};
|
|
80
|
-
throw new TypeError("addEventListener(): the handler must be a function, [function, data] or an object with handleEvent.");
|
|
55
|
+
/** Binds a listener object natively (never delegated), honoring its options. */
|
|
56
|
+
function bindListenerObject(el, name, object, capture) {
|
|
57
|
+
const { once, passive, signal } = object;
|
|
58
|
+
return listen(el, name, (event) => object.handleEvent(event), {
|
|
59
|
+
capture: object.capture === true || capture,
|
|
60
|
+
once,
|
|
61
|
+
passive,
|
|
62
|
+
signal
|
|
63
|
+
});
|
|
81
64
|
}
|
|
82
65
|
/**
|
|
83
66
|
* Combines several handlers for one event name on one element into one handler that calls them in
|
|
@@ -103,6 +86,17 @@ function chainEvents(...handlers) {
|
|
|
103
86
|
for (const handler of handlers) handler.call(this, event);
|
|
104
87
|
};
|
|
105
88
|
}
|
|
89
|
+
/** Installs the delegated listener for one event name on `target`, unless it is there already. */
|
|
90
|
+
function installDelegate(name, target) {
|
|
91
|
+
let known = installed.get(target);
|
|
92
|
+
if (known === void 0) {
|
|
93
|
+
known = /* @__PURE__ */ new Set();
|
|
94
|
+
installed.set(target, known);
|
|
95
|
+
}
|
|
96
|
+
if (known.has(name)) return;
|
|
97
|
+
known.add(name);
|
|
98
|
+
target.addEventListener(name, dispatchDelegated);
|
|
99
|
+
}
|
|
106
100
|
/**
|
|
107
101
|
* Installs the document listener that runs delegated handlers for each event name, once per
|
|
108
102
|
* document and name; repeated calls do nothing. Compiled modules call it for the events they
|
|
@@ -121,16 +115,7 @@ function chainEvents(...handlers) {
|
|
|
121
115
|
* @since 1.0.0
|
|
122
116
|
*/
|
|
123
117
|
function delegateEvents(names, target = globalThis.document) {
|
|
124
|
-
|
|
125
|
-
if (known === void 0) {
|
|
126
|
-
known = /* @__PURE__ */ new Set();
|
|
127
|
-
installed.set(target, known);
|
|
128
|
-
}
|
|
129
|
-
for (const name of names) {
|
|
130
|
-
if (known.has(name)) continue;
|
|
131
|
-
known.add(name);
|
|
132
|
-
target.addEventListener(name, dispatchDelegated);
|
|
133
|
-
}
|
|
118
|
+
for (const name of names) installDelegate(name, target);
|
|
134
119
|
}
|
|
135
120
|
/**
|
|
136
121
|
* Removes the delegated listeners {@link delegateEvents} installed on `target`. Delegated handlers stop
|
|
@@ -174,30 +159,29 @@ function delegationDocument(el) {
|
|
|
174
159
|
function bindEvent(el, name, handler, delegate, capture = false) {
|
|
175
160
|
if (handler === null || handler === void 0 || handler === false) return void 0;
|
|
176
161
|
if (isListenerObject(handler)) return bindListenerObject(el, name, handler, capture);
|
|
177
|
-
|
|
162
|
+
let fn = handler;
|
|
163
|
+
let data;
|
|
164
|
+
let tuple = false;
|
|
165
|
+
if (Array.isArray(handler) && typeof handler[0] === "function") {
|
|
166
|
+
fn = handler[0];
|
|
167
|
+
data = handler[1];
|
|
168
|
+
tuple = true;
|
|
169
|
+
} else if (typeof handler !== "function") throw new TypeError("addEventListener(): the handler must be a function, [function, data] or an object with handleEvent.");
|
|
178
170
|
const slot = `$$${name}`;
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
delegateEvents([name], delegationDocument(el));
|
|
171
|
+
if (delegate && (!tuple || data !== void 0) && !capture && DELEGATED_EVENTS.test(name) && Reflect.get(el, slot) === void 0) {
|
|
172
|
+
installDelegate(name, delegationDocument(el));
|
|
182
173
|
const dataKey = `${slot}Data`;
|
|
183
|
-
Reflect.set(el, slot,
|
|
184
|
-
if (
|
|
174
|
+
Reflect.set(el, slot, fn);
|
|
175
|
+
if (tuple) Reflect.set(el, dataKey, data);
|
|
185
176
|
else Reflect.deleteProperty(el, dataKey);
|
|
186
177
|
return () => {
|
|
187
|
-
if (Reflect.get(el, slot) ===
|
|
178
|
+
if (Reflect.get(el, slot) === fn) {
|
|
188
179
|
Reflect.deleteProperty(el, slot);
|
|
189
180
|
Reflect.deleteProperty(el, dataKey);
|
|
190
181
|
}
|
|
191
182
|
};
|
|
192
183
|
}
|
|
193
|
-
|
|
194
|
-
const args = binding.tuple ? [binding.data, event] : [event];
|
|
195
|
-
batch(() => untrack(() => binding.fn.call(el, ...args)));
|
|
196
|
-
};
|
|
197
|
-
el.addEventListener(name, listener, capture);
|
|
198
|
-
return () => {
|
|
199
|
-
el.removeEventListener(name, listener, capture);
|
|
200
|
-
};
|
|
184
|
+
return listen(el, name, (event) => fn.call(el, ...tuple ? [data, event] : [event]), capture);
|
|
201
185
|
}
|
|
202
186
|
/**
|
|
203
187
|
* Binds an event handler to an element: the helper compiled templates call for `onX` and the `on:`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","names":[],"sources":["../../src/events.ts"],"sourcesContent":["import { batch, getOwner, onCleanup, untrack } from \"@shadow-js/core\";\n\n/**\n * Events that may be delegated: composed events, which leave a shadow root and reach the document.\n * `change` is not composed, so it is bound on its element (see the note on `bindEvent`).\n */\nconst DELEGATED_EVENTS =\n /^(?:click|dblclick|input|beforeinput|contextmenu|key(?:down|up|press)|(?:pointer|mouse)(?:down|up|move|over|out)|focus(?:in|out)|touch(?:start|end|move))$/;\n\n/** Documents that already carry the delegated listener for a given event name. */\nconst installed = new WeakMap<Document, Set<string>>();\n\n/** A handler together with its optional data; `tuple` records the `[fn, data]` form. */\ninterface Binding {\n readonly fn: (this: EventTarget, ...args: unknown[]) => unknown;\n readonly data: unknown;\n readonly tuple: boolean;\n}\n\n/** Calls `fn` with `this` = node, retargeting `currentTarget` for the duration of the call. */\nfunction invoke(fn: Binding[\"fn\"], node: EventTarget, event: Event, args: unknown[]): void {\n Object.defineProperty(event, \"currentTarget\", { configurable: true, get: () => node });\n try {\n untrack(() => fn.call(node, ...args));\n } finally {\n Reflect.deleteProperty(event, \"currentTarget\");\n }\n}\n\n/**\n * The one listener per (document, event). It walks `composedPath()` from the target outward,\n * calling `node.$$<type>` with `this = node`. Stops when a handler stops propagation.\n */\nfunction dispatchDelegated(event: Event): void {\n // One batch per event: every handler on the path runs first, then the effects, so the DOM is\n // current when the event finishes (ADR-007).\n batch(() => dispatchPath(event));\n}\n\nfunction dispatchPath(event: Event): void {\n const key = `$$${event.type}`;\n const dataKey = `${key}Data`;\n const errors: unknown[] = [];\n for (const node of event.composedPath()) {\n if (event.cancelBubble) break;\n const fn = Reflect.get(node, key);\n if (typeof fn !== \"function\") continue;\n const data = Reflect.get(node, dataKey);\n try {\n invoke(fn as Binding[\"fn\"], node, event, data === undefined ? [event] : [data, event]);\n } catch (error) {\n errors.push(error);\n }\n }\n const [first] = errors;\n if (errors.length === 1) throw first;\n if (errors.length > 1)\n throw new AggregateError(\n errors,\n __DEV__ ? \"Several event handlers threw.\" : \"SHADOW_EVENT_ERRORS\",\n );\n}\n\n/** A DOM-style listener object: `handleEvent` plus the `addEventListener` options. */\ninterface ListenerObject {\n handleEvent(event: Event): unknown;\n once?: boolean;\n passive?: boolean;\n capture?: boolean;\n signal?: AbortSignal;\n}\n\nfunction isListenerObject(handler: unknown): handler is ListenerObject {\n return (\n typeof handler === \"object\" &&\n handler !== null &&\n typeof (handler as { handleEvent?: unknown }).handleEvent === \"function\"\n );\n}\n\n/** Binds a listener object natively (never delegated), honoring its options. */\nfunction bindListenerObject(\n el: Element,\n name: string,\n object: ListenerObject,\n capture: boolean,\n): () => void {\n const { once, passive, signal } = object;\n // A member that is `undefined` counts as absent to the DOM, so none of them needs a check.\n const options = {\n capture: object.capture === true || capture,\n once,\n passive,\n signal,\n } as AddEventListenerOptions;\n const listener = (event: Event): void => {\n batch(() => untrack(() => object.handleEvent(event)));\n };\n el.addEventListener(name, listener, options);\n return () => {\n el.removeEventListener(name, listener, options);\n };\n}\n\n/** Normalizes a handler value into a binding; throws for values that are neither. */\nfunction toBinding(handler: unknown): Binding {\n if (typeof handler === \"function\") {\n return { fn: handler as Binding[\"fn\"], data: undefined, tuple: false };\n }\n if (Array.isArray(handler) && typeof handler[0] === \"function\") {\n return { fn: handler[0] as Binding[\"fn\"], data: handler[1], tuple: true };\n }\n throw new TypeError(\n __DEV__\n ? \"addEventListener(): the handler must be a function, [function, data] or an object with handleEvent.\"\n : \"SHADOW_EVENT_HANDLER\",\n );\n}\n\n/**\n * Combines several handlers for one event name on one element into one handler that calls them in\n * order with the same event. The compiler uses it when an element has, for example, both `onInput`\n * and a text input's `onChange`: the delegated slot holds one function.\n *\n * @param handlers The handlers, in source order. None gives a handler that does nothing.\n * @returns A handler that calls each of them with the same `this` and event. An error thrown by one\n * handler propagates and the later handlers do not run.\n * @example\n * import { addEventListener, chainEvents } from \"@shadow-js/web\";\n *\n * const input = document.createElement(\"input\");\n * const onInput = chainEvents(\n * (event) => console.log(\"validate\", event.type),\n * (event) => console.log(\"save\", event.type),\n * );\n * addEventListener(input, \"input\", onInput);\n * @since 1.0.0\n */\nexport function chainEvents(\n ...handlers: Array<(this: EventTarget, event: Event) => unknown>\n): (this: EventTarget, event: Event) => void {\n return function chained(this: EventTarget, event: Event): void {\n for (const handler of handlers) handler.call(this, event);\n };\n}\n\n/**\n * Installs the document listener that runs delegated handlers for each event name, once per\n * document and name; repeated calls do nothing. Compiled modules call it for the events they\n * delegate, so application code rarely needs it. The listener walks `composedPath()` from the target\n * outward and runs each element's delegated handler in one batch, stopping when a handler stops\n * propagation. A non-composed event raised inside a shadow root never reaches the document, so bind\n * such events natively.\n *\n * @param names Event names to delegate, such as `[\"click\", \"input\"]`.\n * @param target Document that receives the listeners. Default: the global `document`.\n * @example\n * import { delegateEvents } from \"@shadow-js/web\";\n *\n * delegateEvents([\"click\", \"input\"]);\n * @see clearDelegatedEvents\n * @since 1.0.0\n */\nexport function delegateEvents(names: string[], target: Document = globalThis.document): void {\n let known = installed.get(target);\n if (known === undefined) {\n known = new Set<string>();\n installed.set(target, known);\n }\n for (const name of names) {\n if (known.has(name)) continue;\n known.add(name);\n target.addEventListener(name, dispatchDelegated);\n }\n}\n\n/**\n * Removes the delegated listeners {@link delegateEvents} installed on `target`. Delegated handlers stop\n * running until `delegateEvents` is called again (Solid's `clearDelegatedEvents`). Use it when a page\n * unmounts ShadowJS entirely, for example a micro-frontend that hands the document back. A document\n * without delegated listeners is left as is.\n *\n * @param target Document whose listeners are removed. Default: the global `document`.\n * @example\n * import { clearDelegatedEvents } from \"@shadow-js/web\";\n *\n * export function unmountApp(dispose: () => void): void {\n * dispose();\n * clearDelegatedEvents();\n * }\n * @see delegateEvents\n * @since 1.0.0\n */\nexport function clearDelegatedEvents(target: Document = globalThis.document): void {\n const known = installed.get(target);\n if (known === undefined) return;\n for (const name of known) target.removeEventListener(name, dispatchDelegated);\n installed.delete(target);\n}\n\n/**\n * The document that must carry the delegated listener for `el`. A template clone is owned by the\n * template's inert document (no window, never receives an event) until it is inserted, and handlers\n * are bound before that: use the page's document then, which is where the element will live.\n */\nfunction delegationDocument(el: Element): Document {\n const owner = el.ownerDocument;\n return owner !== null && owner.defaultView !== null ? owner : globalThis.document;\n}\n\n/**\n * Binds one handler and returns the function that undoes it. A delegated event is stored on the\n * element as an expando; the document listener picks it up. Other events get a native listener.\n * Non-composed events (`change`, `select`, `load`, ...) never leave a shadow root, so they always get\n * a native listener, whatever the caller asked for.\n * @internal\n */\nexport function bindEvent(\n el: Element,\n name: string,\n handler: unknown,\n delegate: boolean,\n capture = false,\n): (() => void) | undefined {\n if (handler === null || handler === undefined || handler === false) return undefined;\n if (isListenerObject(handler)) return bindListenerObject(el, name, handler, capture);\n const binding = toBinding(handler);\n // One delegated slot per event name: a second handler for the same name on this element (React's\n // onInput and onChange on one text input) binds natively, so both run.\n const slot = `$$${name}`;\n // The delegated slot tells a tuple from a plain handler by its data being defined, so a tuple whose\n // data is undefined is bound natively, where it still receives `(undefined, event)`.\n const plain = !binding.tuple || binding.data !== undefined;\n if (\n delegate &&\n plain &&\n !capture &&\n DELEGATED_EVENTS.test(name) &&\n Reflect.get(el, slot) === undefined\n ) {\n delegateEvents([name], delegationDocument(el));\n const dataKey = `${slot}Data`;\n Reflect.set(el, slot, binding.fn);\n if (binding.tuple) Reflect.set(el, dataKey, binding.data);\n else Reflect.deleteProperty(el, dataKey);\n return () => {\n if (Reflect.get(el, slot) === binding.fn) {\n Reflect.deleteProperty(el, slot);\n Reflect.deleteProperty(el, dataKey);\n }\n };\n }\n const listener = (event: Event): void => {\n const args: unknown[] = binding.tuple ? [binding.data, event] : [event];\n batch(() => untrack(() => binding.fn.call(el, ...args)));\n };\n el.addEventListener(name, listener, capture);\n return () => {\n el.removeEventListener(name, listener, capture);\n };\n}\n\n/**\n * Binds an event handler to an element: the helper compiled templates call for `onX` and the `on:`\n * and `oncapture:` prefixes. Handlers run batched and untracked, with `this` set to the element.\n * Inside an owner, the listener is removed when the owner is disposed, even if the element outlives\n * it.\n *\n * @param el Target element.\n * @param name Event name, lowercase, such as `click`.\n * @param handler A function (called with the event), a `[fn, data]` tuple (called as\n * `fn(data, event)`), or a listener object `{ handleEvent, once, passive, capture, signal }`, which\n * is always bound natively with those options. `null`, `undefined` and `false` bind nothing.\n * @param delegate `true` stores the handler on the element for the document listener of\n * {@link delegateEvents} (installed on demand) when `name` is a delegated event (`click`, `input`,\n * `keydown`, pointer, mouse, touch and focus events, ...) and the element has no delegated handler\n * for it yet. Otherwise, and when undefined, the handler gets a native listener.\n * @param capture `true` listens in the capture phase, never delegated. Undefined means the bubble phase.\n * @throws TypeError `SHADOW_EVENT_HANDLER` when `handler` is not a function, a tuple whose first item\n * is a function, or a listener object.\n * @example\n * import { addEventListener } from \"@shadow-js/web\";\n *\n * const button = document.createElement(\"button\");\n * addEventListener(button, \"click\", () => console.log(\"pressed\"), true);\n * addEventListener(button, \"focus\", [(id: string, event: Event) => console.log(id, event.type), \"save\"]);\n * @see delegateEvents\n * @since 1.0.0\n */\nexport function addEventListener(\n el: Element,\n name: string,\n handler: unknown,\n delegate?: boolean,\n capture?: boolean,\n): void {\n const unbind = bindEvent(el, name, handler, delegate === true, capture === true);\n // The listener goes when the owner does, even if the element outlives it (moved, portaled, reused).\n if (unbind !== undefined && getOwner() !== null) onCleanup(unbind);\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"events.js","names":[],"sources":["../../src/events.ts"],"sourcesContent":["import { batch, getOwner, onCleanup, untrack } from \"@shadow-js/core\";\n\n/**\n * Events that may be delegated: composed events, which leave a shadow root and reach the document.\n * `change` is not composed, so it is bound on its element (see the note on `bindEvent`).\n */\nconst DELEGATED_EVENTS =\n /^(?:click|dblclick|input|beforeinput|contextmenu|key(?:down|up|press)|(?:pointer|mouse)(?:down|up|move|over|out)|focus(?:in|out)|touch(?:start|end|move))$/;\n\n/** Documents that already carry the delegated listener for a given event name. */\nconst installed = new WeakMap<Document, Set<string>>();\n\n/** A bound handler: called with `this` = the node. */\ntype Handler = (this: EventTarget, ...args: unknown[]) => unknown;\n\n/**\n * The one listener per (document, event). It walks `composedPath()` from the target outward,\n * calling `node.$$<type>` with `this = node` and `currentTarget` retargeted to the node for the\n * duration of the call. Stops when a handler stops propagation.\n */\nfunction dispatchDelegated(event: Event): void {\n // One batch per event: every handler on the path runs first, then the effects, so the DOM is\n // current when the event finishes (ADR-007).\n batch(() => {\n const key = `$$${event.type}`;\n const dataKey = `${key}Data`;\n const errors: unknown[] = [];\n for (const node of event.composedPath()) {\n if (event.cancelBubble) break;\n const fn = Reflect.get(node, key);\n if (typeof fn !== \"function\") continue;\n const data = Reflect.get(node, dataKey);\n try {\n Object.defineProperty(event, \"currentTarget\", { configurable: true, get: () => node });\n untrack(() =>\n (fn as Handler).call(node, ...(data === undefined ? [event] : [data, event])),\n );\n } catch (error) {\n errors.push(error);\n } finally {\n Reflect.deleteProperty(event, \"currentTarget\");\n }\n }\n const [first] = errors;\n if (errors.length === 1) throw first;\n if (errors.length > 1)\n throw new AggregateError(\n errors,\n __DEV__ ? \"Several event handlers threw.\" : \"SHADOW_EVENT_ERRORS\",\n );\n });\n}\n\n/** A DOM-style listener object: `handleEvent` plus the `addEventListener` options. */\ninterface ListenerObject {\n handleEvent(event: Event): unknown;\n once?: boolean;\n passive?: boolean;\n capture?: boolean;\n signal?: AbortSignal;\n}\n\nfunction isListenerObject(handler: unknown): handler is ListenerObject {\n return (\n typeof handler === \"object\" &&\n handler !== null &&\n typeof (handler as { handleEvent?: unknown }).handleEvent === \"function\"\n );\n}\n\n/** Adds a native listener that runs `run` untracked in one batch; returns the function that removes it. */\nfunction listen(\n el: Element,\n name: string,\n run: (event: Event) => unknown,\n options: AddEventListenerOptions | boolean,\n): () => void {\n const listener = (event: Event): void => {\n batch(() => untrack(() => run(event)));\n };\n el.addEventListener(name, listener, options);\n return () => {\n el.removeEventListener(name, listener, options);\n };\n}\n\n/** Binds a listener object natively (never delegated), honoring its options. */\nfunction bindListenerObject(\n el: Element,\n name: string,\n object: ListenerObject,\n capture: boolean,\n): () => void {\n const { once, passive, signal } = object;\n // A member that is `undefined` counts as absent to the DOM, so none of them needs a check.\n return listen(el, name, (event) => object.handleEvent(event), {\n capture: object.capture === true || capture,\n once,\n passive,\n signal,\n } as AddEventListenerOptions);\n}\n\n/**\n * Combines several handlers for one event name on one element into one handler that calls them in\n * order with the same event. The compiler uses it when an element has, for example, both `onInput`\n * and a text input's `onChange`: the delegated slot holds one function.\n *\n * @param handlers The handlers, in source order. None gives a handler that does nothing.\n * @returns A handler that calls each of them with the same `this` and event. An error thrown by one\n * handler propagates and the later handlers do not run.\n * @example\n * import { addEventListener, chainEvents } from \"@shadow-js/web\";\n *\n * const input = document.createElement(\"input\");\n * const onInput = chainEvents(\n * (event) => console.log(\"validate\", event.type),\n * (event) => console.log(\"save\", event.type),\n * );\n * addEventListener(input, \"input\", onInput);\n * @since 1.0.0\n */\nexport function chainEvents(\n ...handlers: Array<(this: EventTarget, event: Event) => unknown>\n): (this: EventTarget, event: Event) => void {\n return function chained(this: EventTarget, event: Event): void {\n for (const handler of handlers) handler.call(this, event);\n };\n}\n\n/** Installs the delegated listener for one event name on `target`, unless it is there already. */\nfunction installDelegate(name: string, target: Document): void {\n let known = installed.get(target);\n if (known === undefined) {\n known = new Set<string>();\n installed.set(target, known);\n }\n if (known.has(name)) return;\n known.add(name);\n target.addEventListener(name, dispatchDelegated);\n}\n\n/**\n * Installs the document listener that runs delegated handlers for each event name, once per\n * document and name; repeated calls do nothing. Compiled modules call it for the events they\n * delegate, so application code rarely needs it. The listener walks `composedPath()` from the target\n * outward and runs each element's delegated handler in one batch, stopping when a handler stops\n * propagation. A non-composed event raised inside a shadow root never reaches the document, so bind\n * such events natively.\n *\n * @param names Event names to delegate, such as `[\"click\", \"input\"]`.\n * @param target Document that receives the listeners. Default: the global `document`.\n * @example\n * import { delegateEvents } from \"@shadow-js/web\";\n *\n * delegateEvents([\"click\", \"input\"]);\n * @see clearDelegatedEvents\n * @since 1.0.0\n */\nexport function delegateEvents(names: string[], target: Document = globalThis.document): void {\n for (const name of names) installDelegate(name, target);\n}\n\n/**\n * Removes the delegated listeners {@link delegateEvents} installed on `target`. Delegated handlers stop\n * running until `delegateEvents` is called again (Solid's `clearDelegatedEvents`). Use it when a page\n * unmounts ShadowJS entirely, for example a micro-frontend that hands the document back. A document\n * without delegated listeners is left as is.\n *\n * @param target Document whose listeners are removed. Default: the global `document`.\n * @example\n * import { clearDelegatedEvents } from \"@shadow-js/web\";\n *\n * export function unmountApp(dispose: () => void): void {\n * dispose();\n * clearDelegatedEvents();\n * }\n * @see delegateEvents\n * @since 1.0.0\n */\nexport function clearDelegatedEvents(target: Document = globalThis.document): void {\n const known = installed.get(target);\n if (known === undefined) return;\n for (const name of known) target.removeEventListener(name, dispatchDelegated);\n installed.delete(target);\n}\n\n/**\n * The document that must carry the delegated listener for `el`. A template clone is owned by the\n * template's inert document (no window, never receives an event) until it is inserted, and handlers\n * are bound before that: use the page's document then, which is where the element will live.\n */\nfunction delegationDocument(el: Element): Document {\n const owner = el.ownerDocument;\n return owner !== null && owner.defaultView !== null ? owner : globalThis.document;\n}\n\n/**\n * Binds one handler and returns the function that undoes it. A delegated event is stored on the\n * element as an expando; the document listener picks it up. Other events get a native listener.\n * Non-composed events (`change`, `select`, `load`, ...) never leave a shadow root, so they always get\n * a native listener, whatever the caller asked for.\n * @internal\n */\nexport function bindEvent(\n el: Element,\n name: string,\n handler: unknown,\n delegate: boolean,\n capture = false,\n): (() => void) | undefined {\n if (handler === null || handler === undefined || handler === false) return undefined;\n if (isListenerObject(handler)) return bindListenerObject(el, name, handler, capture);\n let fn = handler as Handler;\n let data: unknown;\n let tuple = false;\n if (Array.isArray(handler) && typeof handler[0] === \"function\") {\n fn = handler[0] as Handler;\n data = handler[1];\n tuple = true;\n } else if (typeof handler !== \"function\") {\n throw new TypeError(\n __DEV__\n ? \"addEventListener(): the handler must be a function, [function, data] or an object with handleEvent.\"\n : \"SHADOW_EVENT_HANDLER\",\n );\n }\n // One delegated slot per event name: a second handler for the same name on this element (React's\n // onInput and onChange on one text input) binds natively, so both run.\n const slot = `$$${name}`;\n // The delegated slot tells a tuple from a plain handler by its data being defined, so a tuple whose\n // data is undefined is bound natively, where it still receives `(undefined, event)`.\n if (\n delegate &&\n (!tuple || data !== undefined) &&\n !capture &&\n DELEGATED_EVENTS.test(name) &&\n Reflect.get(el, slot) === undefined\n ) {\n installDelegate(name, delegationDocument(el));\n const dataKey = `${slot}Data`;\n Reflect.set(el, slot, fn);\n if (tuple) Reflect.set(el, dataKey, data);\n else Reflect.deleteProperty(el, dataKey);\n return () => {\n if (Reflect.get(el, slot) === fn) {\n Reflect.deleteProperty(el, slot);\n Reflect.deleteProperty(el, dataKey);\n }\n };\n }\n return listen(el, name, (event) => fn.call(el, ...(tuple ? [data, event] : [event])), capture);\n}\n\n/**\n * Binds an event handler to an element: the helper compiled templates call for `onX` and the `on:`\n * and `oncapture:` prefixes. Handlers run batched and untracked, with `this` set to the element.\n * Inside an owner, the listener is removed when the owner is disposed, even if the element outlives\n * it.\n *\n * @param el Target element.\n * @param name Event name, lowercase, such as `click`.\n * @param handler A function (called with the event), a `[fn, data]` tuple (called as\n * `fn(data, event)`), or a listener object `{ handleEvent, once, passive, capture, signal }`, which\n * is always bound natively with those options. `null`, `undefined` and `false` bind nothing.\n * @param delegate `true` stores the handler on the element for the document listener of\n * {@link delegateEvents} (installed on demand) when `name` is a delegated event (`click`, `input`,\n * `keydown`, pointer, mouse, touch and focus events, ...) and the element has no delegated handler\n * for it yet. Otherwise, and when undefined, the handler gets a native listener.\n * @param capture `true` listens in the capture phase, never delegated. Undefined means the bubble phase.\n * @throws TypeError `SHADOW_EVENT_HANDLER` when `handler` is not a function, a tuple whose first item\n * is a function, or a listener object.\n * @example\n * import { addEventListener } from \"@shadow-js/web\";\n *\n * const button = document.createElement(\"button\");\n * addEventListener(button, \"click\", () => console.log(\"pressed\"), true);\n * addEventListener(button, \"focus\", [(id: string, event: Event) => console.log(id, event.type), \"save\"]);\n * @see delegateEvents\n * @since 1.0.0\n */\nexport function addEventListener(\n el: Element,\n name: string,\n handler: unknown,\n delegate?: boolean,\n capture?: boolean,\n): void {\n const unbind = bindEvent(el, name, handler, delegate === true, capture === true);\n // The listener goes when the owner does, even if the element outlives it (moved, portaled, reused).\n if (unbind !== undefined && getOwner() !== null) onCleanup(unbind);\n}\n"],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { leaves } from "./internal/accessor.js";
|
|
2
2
|
import { checkClaimedText } from "./internal/claim.js";
|
|
3
3
|
import { claims } from "./internal/hydration-hooks.js";
|
|
4
|
-
import { reconcileNodes } from "./internal/reconcile.js";
|
|
4
|
+
import { keepFocus, reconcileNodes } from "./internal/reconcile.js";
|
|
5
5
|
import { onCleanup, useRenderEffect } from "@shadow-js/core";
|
|
6
6
|
import { addCleanup, createComputation, currentOwner, disposeOwner, readComputation } from "@shadow-js/core/extend";
|
|
7
7
|
// src/insert.ts
|
|
@@ -120,12 +120,17 @@ function watchCommits(parent, run) {
|
|
|
120
120
|
set.delete(run);
|
|
121
121
|
});
|
|
122
122
|
}
|
|
123
|
-
/**
|
|
124
|
-
function
|
|
123
|
+
/** Applies a flattened value to a region. */
|
|
124
|
+
function commit(region, parts) {
|
|
125
|
+
if (region.claimed !== void 0) {
|
|
126
|
+
checkClaimedText(region.claimed, parts);
|
|
127
|
+
region.claimed = void 0;
|
|
128
|
+
}
|
|
129
|
+
const next = materialize(region, parts);
|
|
125
130
|
const parent = region.parent;
|
|
126
131
|
const attached = region.nodes.filter((node) => node.parentNode === parent);
|
|
127
|
-
const end = endOf(region, attached.at(-1));
|
|
128
132
|
const first = attached[0];
|
|
133
|
+
const end = endOf(region, attached.at(-1));
|
|
129
134
|
if (next.length === 0 && first !== void 0) region.marker = first.previousSibling;
|
|
130
135
|
reconcileNodes(parent, attached, next, end);
|
|
131
136
|
region.nodes = next;
|
|
@@ -134,14 +139,6 @@ function reconcileRegion(region, next) {
|
|
|
134
139
|
run();
|
|
135
140
|
});
|
|
136
141
|
}
|
|
137
|
-
/** Applies a flattened value to a region. */
|
|
138
|
-
function commit(region, parts) {
|
|
139
|
-
if (region.claimed !== void 0) {
|
|
140
|
-
checkClaimedText(region.claimed, parts);
|
|
141
|
-
region.claimed = void 0;
|
|
142
|
-
}
|
|
143
|
-
reconcileRegion(region, materialize(region, parts));
|
|
144
|
-
}
|
|
145
142
|
/**
|
|
146
143
|
* Applies a resolved value to a region. A string or number is the common case (a dynamic text): when the region
|
|
147
144
|
* already shows its own Text node only the data is rewritten, and an empty region gets one new Text node, with none of
|
|
@@ -150,7 +147,7 @@ function commit(region, parts) {
|
|
|
150
147
|
function commitValue(region, raw) {
|
|
151
148
|
if ((typeof raw === "string" || typeof raw === "number") && !region.claimed) {
|
|
152
149
|
const nodes = region.nodes;
|
|
153
|
-
const text =
|
|
150
|
+
const text = String(raw);
|
|
154
151
|
if (nodes.length === 1) {
|
|
155
152
|
const current = nodes[0];
|
|
156
153
|
if (current instanceof Text && current.parentNode === region.parent && ownsText(region, current)) {
|
|
@@ -167,28 +164,25 @@ function commitValue(region, raw) {
|
|
|
167
164
|
}
|
|
168
165
|
commit(region, flatten(raw));
|
|
169
166
|
}
|
|
170
|
-
/** Nodes of `initial` (already in the parent) that the region adopts as its current content. */
|
|
171
|
-
function adoptInitial(parent, initial) {
|
|
172
|
-
const adopted = [];
|
|
173
|
-
const seen = /* @__PURE__ */ new Set();
|
|
174
|
-
for (const part of flatten(initial)) {
|
|
175
|
-
if (typeof part === "string" || seen.has(part) || part.parentNode !== parent) continue;
|
|
176
|
-
seen.add(part);
|
|
177
|
-
adopted.push(part);
|
|
178
|
-
}
|
|
179
|
-
return adopted;
|
|
180
|
-
}
|
|
181
167
|
/**
|
|
182
168
|
* Creates the state of a region in `parent`. `anchorNode` (null to append) and `initial` (nodes
|
|
183
169
|
* already in the DOM, from hydration or splitText) are both optional.
|
|
184
170
|
* @internal
|
|
185
171
|
*/
|
|
186
172
|
function createRegion(parent, anchorNode, initial) {
|
|
187
|
-
const nodes =
|
|
173
|
+
const nodes = [];
|
|
174
|
+
if (initial !== void 0) {
|
|
175
|
+
const seen = /* @__PURE__ */ new Set();
|
|
176
|
+
for (const part of flatten(initial)) {
|
|
177
|
+
if (typeof part === "string" || seen.has(part) || part.parentNode !== parent) continue;
|
|
178
|
+
seen.add(part);
|
|
179
|
+
nodes.push(part);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
188
182
|
const region = {
|
|
189
183
|
parent,
|
|
190
184
|
anchor: anchorNode,
|
|
191
|
-
marker: nodes.length > 0 ? nodes[0]
|
|
185
|
+
marker: nodes.length > 0 ? nodes[0].previousSibling : parent.lastChild,
|
|
192
186
|
nodes,
|
|
193
187
|
texts: null
|
|
194
188
|
};
|
|
@@ -201,7 +195,9 @@ function createRegion(parent, anchorNode, initial) {
|
|
|
201
195
|
* and ends exactly where this one starts, that region gets an empty Text node there as its anchor. Its content then
|
|
202
196
|
* always goes before that node, and this region's marker is the node, so no region has a marker that a sibling
|
|
203
197
|
* region can replace: the order of the calls holds however the regions change. A region with static content
|
|
204
|
-
* between it and this one needs nothing, because its marker and its end are the static nodes.
|
|
198
|
+
* between it and this one needs nothing, because its marker and its end are the static nodes. (A function of its
|
|
199
|
+
* own, so the cleanup it registers holds nothing but the anchor: a closure made inside `bindRegion` would keep
|
|
200
|
+
* the regions of that call alive as long as the parent's owner.)
|
|
205
201
|
*/
|
|
206
202
|
function linkRegion(region) {
|
|
207
203
|
const parent = region.parent;
|
|
@@ -236,42 +232,6 @@ function containsFunction(root) {
|
|
|
236
232
|
return false;
|
|
237
233
|
}
|
|
238
234
|
/**
|
|
239
|
-
* One memo per accessor function, owned by `owner` (the effect that evaluates the region's expression,
|
|
240
|
-
* so a new result drops them all; the effect that resolves the result runs many times and must not
|
|
241
|
-
* own them). `prune` disposes the memos of accessors the last
|
|
242
|
-
* run did not meet, which bounds the cache by what the region currently shows.
|
|
243
|
-
*/
|
|
244
|
-
function createCallCache(owner) {
|
|
245
|
-
const memos = /* @__PURE__ */ new Map();
|
|
246
|
-
let touched = /* @__PURE__ */ new Set();
|
|
247
|
-
return {
|
|
248
|
-
begin() {
|
|
249
|
-
touched = /* @__PURE__ */ new Set();
|
|
250
|
-
},
|
|
251
|
-
call(fn) {
|
|
252
|
-
touched.add(fn);
|
|
253
|
-
let node = memos.get(fn);
|
|
254
|
-
if (node === void 0) {
|
|
255
|
-
node = createComputation({
|
|
256
|
-
kind: "memo",
|
|
257
|
-
fn: () => fn(),
|
|
258
|
-
allowWrites: true,
|
|
259
|
-
owner
|
|
260
|
-
});
|
|
261
|
-
memos.set(fn, node);
|
|
262
|
-
}
|
|
263
|
-
return readComputation(node);
|
|
264
|
-
},
|
|
265
|
-
prune() {
|
|
266
|
-
for (const [fn, node] of memos) {
|
|
267
|
-
if (touched.has(fn)) continue;
|
|
268
|
-
memos.delete(fn);
|
|
269
|
-
disposeOwner(node);
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
};
|
|
273
|
-
}
|
|
274
|
-
/**
|
|
275
235
|
* Keeps a region in sync with `value`. A value that is or contains a function (an accessor, or an
|
|
276
236
|
* array with accessor members) runs inside a render effect, so its reads are tracked. Anything
|
|
277
237
|
* else is inserted once. `ordered` is for `insert()` without an anchor: a region that keeps changing then keeps
|
|
@@ -288,11 +248,31 @@ function bindRegion(region, value, ordered) {
|
|
|
288
248
|
useRenderEffect(typeof value === "function" ? value : () => value, (raw) => {
|
|
289
249
|
latest = raw;
|
|
290
250
|
if (containsFunction(raw)) {
|
|
291
|
-
const
|
|
251
|
+
const owner = currentOwner();
|
|
252
|
+
const memos = /* @__PURE__ */ new Map();
|
|
253
|
+
let touched = /* @__PURE__ */ new Set();
|
|
254
|
+
const call = (fn) => {
|
|
255
|
+
touched.add(fn);
|
|
256
|
+
let node = memos.get(fn);
|
|
257
|
+
if (node === void 0) {
|
|
258
|
+
node = createComputation({
|
|
259
|
+
kind: "memo",
|
|
260
|
+
fn: () => fn(),
|
|
261
|
+
allowWrites: true,
|
|
262
|
+
owner
|
|
263
|
+
});
|
|
264
|
+
memos.set(fn, node);
|
|
265
|
+
}
|
|
266
|
+
return readComputation(node);
|
|
267
|
+
};
|
|
292
268
|
useRenderEffect(() => {
|
|
293
|
-
|
|
294
|
-
const parts = flatten(raw,
|
|
295
|
-
|
|
269
|
+
touched = /* @__PURE__ */ new Set();
|
|
270
|
+
const parts = flatten(raw, call);
|
|
271
|
+
for (const [fn, node] of memos) {
|
|
272
|
+
if (touched.has(fn)) continue;
|
|
273
|
+
memos.delete(fn);
|
|
274
|
+
disposeOwner(node);
|
|
275
|
+
}
|
|
296
276
|
return parts;
|
|
297
277
|
}, (parts) => {
|
|
298
278
|
commit(region, parts);
|
|
@@ -313,7 +293,9 @@ function bindRegion(region, value, ordered) {
|
|
|
313
293
|
*/
|
|
314
294
|
function moveRegion(region, parent, move) {
|
|
315
295
|
const attached = region.nodes.filter((node) => node.parentNode === region.parent);
|
|
316
|
-
|
|
296
|
+
keepFocus(region.parent, () => {
|
|
297
|
+
for (const node of attached) move(node);
|
|
298
|
+
});
|
|
317
299
|
region.parent = parent;
|
|
318
300
|
region.marker = attached[0]?.previousSibling ?? parent.lastChild;
|
|
319
301
|
}
|