@dosgato/dialog 1.1.7 → 1.1.8

package/dist/Icon.svelte

@@ -3,7 +3,8 @@
   implementation of icons that adds a hidden label that can be read by screen readers. Useful for situations where aria-label
   isn't supported, to provide in kind icon support, while still making use of aria attributes regardless of support.
 -->
-<script>import Tooltip from './Tooltip.svelte';
+<script>import { randomid } from 'txstate-utils';
+import Tooltip from './Tooltip.svelte';
 export let icon;
 /** Label used in a `<ScreenReaderOnly>`. */
 export let hiddenLabel = undefined;
@@ -11,6 +12,27 @@ export let inline = false;
 export let width = undefined;
 export let height = undefined;
 export let tooltip = undefined;
+function replaceIDs(body) {
+    const matches = body.matchAll(/\sid="(\S+)"/g);
+    const ids = Array.from(matches).map(m => m[1]);
+    if (!ids.length)
+        return body;
+    // Replace with unique ids
+    ids.forEach((id) => {
+        const escapedID = id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        body = body.replace(
+        // Allowed characters before id: [#;"]
+        // Allowed characters after id: [)"], .[a-z]
+        new RegExp('([#;"])(' + escapedID + ')([")]|\\.[a-z])', 'g'), '$1' + randomid() + '$3');
+    });
+    return body;
+}
+const fixedSVG = new Map();
+function svgBody(icon) {
+    if (!fixedSVG.has(icon))
+        fixedSVG.set(icon, replaceIDs(icon.body));
+    return fixedSVG.get(icon);
+}
 // If neither is defined, set both to 1em
 if (!width && !height)
     width = height = '1em';
@@ -20,7 +42,7 @@ height ??= width;
 {#if icon}
   <Tooltip tip={tooltip} top>
     <svg role="img" viewBox="{icon.left ?? 0} {icon.top ?? 0} {icon.width ?? 256} {icon.height ?? 256}" class:vFlip={icon.vFlip} class:hFlip={icon.hFlip} class:inline {width} {height} aria-hidden={!hiddenLabel} aria-label={hiddenLabel} xmlns="http://www.w3.org/2000/svg">
-      {@html icon.body}
+      {@html svgBody(icon)}
     </svg>
   </Tooltip>
 {/if}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dosgato/dialog",
   "description": "A component library for building forms that edit a JSON document.",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "scripts": {
     "prepublishOnly": "svelte-package",
     "dev": "vite dev --force",