@wix/origami-runtime 0.19.1 → 0.19.3

package/README.md

@@ -4,6 +4,31 @@ Before local builds or tests, run `pnpm -r run build` from the repository root t
 
 The root entry exports binding, provider, and component authoring helpers.
 
+`svg(url, uri)` creates a deferred SVG source without calling hooks or fetching content:
+
+```jsx
+import { svg } from '@wix/origami-runtime'
+
+<SvgImage svgId={svg(url, uri)} />
+```
+
+The existing `withOrigami` wrapper resolves these sources before rendering the original component,
+including sources nested in objects, arrays, and `elementProps`. Sources can be created inside
+repeater render callbacks. The wrapper uses a fixed set of hooks even when the number of sources changes.
+React elements and render callbacks are left intact; their own wrapped components resolve their sources.
+
+Resolution returns only `{svgContent}`. The root SVG markup contains the calculated `viewBox`;
+nested SVG viewports remain unchanged. The viewport follows Thunderbolt: non-UGC artwork prefers
+`data-bbox`; UGC preserves the raw viewport or falls back to width and height. The UGC fallback
+accepts unitless and pixel dimensions; other units leave the viewport unspecified.
+
+Sources receive plain URL and URI strings and have no dependency on the media SDK.
+DM reconstructs the Core vector from the expression without fetching or executing it.
+The wrapper supplies empty SVG content while loading or after a fetch failure, reuses loaded URLs
+within its mounted instance, and cancels pending requests when its source URLs change or it unmounts.
+The existing `useSvgProps(url, uri)` hook uses the same resolution implementation for direct hook consumers;
+it must be called at the top level of a React component or hook.
+
 Layout components and the shared DOM/CSS contract belong to
 [`@wix/origami-system-components`](../origami-system-components/README.md).
 This package has no layout subpaths or system-components dependency.

package/dist/index.d.ts

@@ -3,6 +3,9 @@ export type { Binding, ContextHook } from './bindings';
 export { Remove, Show } from './components';
 export { withOrigami } from './withOrigami';
 export { withInteractions } from './withInteractions';
+export { useSvgProps } from './useSvgProps';
+export type { SvgProps } from './svgContent';
+export { svg } from './svg';
 export { cx, rootClass } from './classNames';
 export type { ClassNames, Cond } from './classNames';
 export { prop, defineComponent } from './define';

package/dist/index.js

@@ -2,6 +2,8 @@ export { all, ctx, fn, is, raw, resolve, isBinding } from './bindings';
 export { Remove, Show } from './components';
 export { withOrigami } from './withOrigami';
 export { withInteractions } from './withInteractions';
+export { useSvgProps } from './useSvgProps';
+export { svg } from './svg';
 export { cx, rootClass } from './classNames';
 export { prop, defineComponent } from './define';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA"}

package/dist/svg.d.ts

@@ -0,0 +1,3 @@
+import { type SvgProps } from "./svgContent";
+export declare const svg: (url: string, uri: string) => SvgProps;
+export declare function useSvgSources<T>(props: T): T;

package/dist/svg.js

@@ -0,0 +1,99 @@
+import { isValidElement, useEffect, useRef, useState } from "react";
+import { resolveSvgProps } from "./svgContent";
+const SVG_SOURCE = Symbol.for("@wix/origami-runtime.svgSource");
+// Share both in-flight work and parsed results across mounted wrappers.
+const svgRequests = new Map();
+const loadSvg = (url) => {
+    const cached = svgRequests.get(url);
+    if (cached)
+        return cached;
+    const request = (async () => {
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`SVG fetch failed: ${response.status}`);
+        }
+        const content = await response.text();
+        return resolveSvgProps(content);
+    })().catch((error) => {
+        svgRequests.delete(url);
+        throw error;
+    });
+    svgRequests.set(url, request);
+    return request;
+};
+class SvgSource {
+    url;
+    uri;
+    [SVG_SOURCE] = true;
+    constructor(url, uri) {
+        this.url = url;
+        this.uri = uri;
+    }
+}
+export const svg = (url, uri) => new SvgSource(url, uri);
+const isSvgSource = (value) => value !== null &&
+    typeof value === "object" &&
+    SVG_SOURCE in value &&
+    value[SVG_SOURCE] === true;
+const mapSources = (value, resolve, seen = new WeakMap()) => {
+    if (isSvgSource(value))
+        return resolve(value);
+    if (value === null || typeof value !== "object" || isValidElement(value))
+        return value;
+    if (seen.has(value))
+        return seen.get(value);
+    if (Array.isArray(value)) {
+        const mapped = new Array(value.length);
+        seen.set(value, mapped);
+        value.forEach((entry, index) => {
+            mapped[index] = mapSources(entry, resolve, seen);
+        });
+        return mapped;
+    }
+    if (Object.getPrototypeOf(value) === Object.prototype) {
+        const mapped = {};
+        seen.set(value, mapped);
+        for (const [key, entry] of Object.entries(value)) {
+            Object.defineProperty(mapped, key, {
+                value: mapSources(entry, resolve, seen),
+                enumerable: true,
+                configurable: true,
+                writable: true,
+            });
+        }
+        return mapped;
+    }
+    return value;
+};
+export function useSvgSources(props) {
+    const cache = useRef(new Map());
+    const [, setVersion] = useState(0);
+    const urls = new Set();
+    mapSources(props, (source) => urls.add(source.url));
+    const urlsKey = JSON.stringify([...urls].sort());
+    useEffect(() => {
+        let active = true;
+        const load = async (url) => {
+            try {
+                const resolved = await loadSvg(url);
+                if (active) {
+                    cache.current.set(url, resolved);
+                    setVersion((version) => version + 1);
+                }
+            }
+            catch (error) {
+                if (active)
+                    console.error("Could not load SVG:", error);
+            }
+        };
+        for (const url of JSON.parse(urlsKey)) {
+            if (!cache.current.has(url))
+                void load(url);
+        }
+        return () => {
+            active = false;
+        };
+    }, [urlsKey]);
+    return mapSources(props, (source) => cache.current.get(source.url) ?? { svgContent: "" });
+}
+//# sourceMappingURL=svg.js.map

package/dist/svg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"svg.js","sourceRoot":"","sources":["../src/svg.ts"],"names":[],"mappings":"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"}

package/dist/svgContent.d.ts

@@ -0,0 +1,4 @@
+export interface SvgProps {
+    svgContent: string;
+}
+export declare function resolveSvgProps(svgContent: string): SvgProps;

package/dist/svgContent.js

@@ -0,0 +1,38 @@
+// Other units need a layout or unit conversion context; do not guess their viewport size.
+function viewportDimension(value) {
+    const match = value
+        ?.trim()
+        .match(/^([+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?)(?:px)?$/i);
+    if (!match)
+        return undefined;
+    const dimension = Number(match[1]);
+    return Number.isFinite(dimension) && dimension >= 0 ? dimension : undefined;
+}
+export function resolveSvgProps(svgContent) {
+    const props = { svgContent };
+    if (!svgContent)
+        return props;
+    const document = new DOMParser().parseFromString(svgContent, "image/svg+xml");
+    const svg = document.documentElement;
+    if (svg.localName !== "svg" || document.querySelector("parsererror"))
+        return { svgContent: "" };
+    const contentType = svg.getAttribute("data-type") || "shape";
+    const contentBox = svg.getAttribute("data-bbox") || "";
+    const rawViewBox = svg.getAttribute("viewBox") || "";
+    const width = viewportDimension(svg.getAttribute("width"));
+    const height = viewportDimension(svg.getAttribute("height"));
+    const fallback = contentType === "ugc" && width !== undefined && height !== undefined
+        ? `0 0 ${width} ${height}`
+        : "";
+    const viewBox = !rawViewBox && fallback
+        ? fallback
+        : contentType !== "ugc" && contentBox
+            ? contentBox
+            : rawViewBox;
+    if (viewBox && viewBox !== rawViewBox) {
+        svg.setAttribute("viewBox", viewBox);
+        props.svgContent = new XMLSerializer().serializeToString(svg);
+    }
+    return props;
+}
+//# sourceMappingURL=svgContent.js.map

package/dist/svgContent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"svgContent.js","sourceRoot":"","sources":["../src/svgContent.ts"],"names":[],"mappings":"AAIA,0FAA0F;AAC1F,SAAS,iBAAiB,CAAC,KAAoB;IAC7C,MAAM,KAAK,GAAG,KAAK;QACjB,EAAE,IAAI,EAAE;SACP,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,MAAM,KAAK,GAAa,EAAE,UAAU,EAAE,CAAC;IACvC,IAAI,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IAE9B,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAC9E,MAAM,GAAG,GAAG,QAAQ,CAAC,eAAe,CAAC;IACrC,IAAI,GAAG,CAAC,SAAS,KAAK,KAAK,IAAI,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC;QAClE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAE5B,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC;IAC7D,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,MAAM,QAAQ,GACZ,WAAW,KAAK,KAAK,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;QAClE,CAAC,CAAC,OAAO,KAAK,IAAI,MAAM,EAAE;QAC1B,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,OAAO,GACX,CAAC,UAAU,IAAI,QAAQ;QACrB,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,WAAW,KAAK,KAAK,IAAI,UAAU;YACnC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,UAAU,CAAC;IAEnB,IAAI,OAAO,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACrC,KAAK,CAAC,UAAU,GAAG,IAAI,aAAa,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/useSvgProps.d.ts

@@ -0,0 +1,2 @@
+import type { SvgProps } from './svgContent';
+export declare function useSvgProps(url: string, uri: string): SvgProps;

package/dist/useSvgProps.js

@@ -0,0 +1,5 @@
+import { svg, useSvgSources } from './svg';
+export function useSvgProps(url, uri) {
+    return useSvgSources(svg(url, uri));
+}
+//# sourceMappingURL=useSvgProps.js.map

package/dist/useSvgProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSvgProps.js","sourceRoot":"","sources":["../src/useSvgProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAG1C,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;AACvC,CAAC"}

package/dist/withInteractions.d.ts

@@ -1,2 +1,11 @@
 import React from 'react';
+export declare const InteractionsDefinition: string & {
+    __api: {
+        hasInteractions: (key: string) => boolean;
+    };
+    __config: {};
+    isServiceDefinition?: boolean;
+} & {
+    hasInteractions: (key: string) => boolean;
+};
 export declare const withInteractions: (Component: any) => (props: any) => React.JSX.Element;

package/dist/withInteractions.js

@@ -1,6 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { InteractionsDefinition } from '@wix/site-service-interactions/definition';
+// Restore once @wix/site-service-interactions' dependencies are on public npm, and delete the local
+// InteractionsDefinition below:
+// import { InteractionsDefinition } from '@wix/site-service-interactions/definition'
+import { defineService } from '@wix/services-manager/helpers';
 import { useService } from '@wix/services-manager-react';
+// The id @wix/site-service-interactions defines its service with; a definition is only its id. The service
+// itself is bundled in @wix/origami-services, so a site doesn't install that package, whose dependencies
+// aren't all on public npm (@wix/interact-experience-renderer@0.21.0, @wix/interact-experience@0.16.0,
+// @wix/viewer-service-pages@1.0.18). A workaround until they are; then import InteractionsDefinition from
+// '@wix/site-service-interactions/definition' again, make it a peer, list it in the generator's siteDependencies
+// (packageJson.ts) and delete interactElement.d.ts.
+export const InteractionsDefinition = defineService('@wix/site-service-interactions');
 // Copied from wix-next's @wix/builder-interactions, not imported from it: a component with
 // interactions renders inside an <interact-element> keyed by its comp path, else its id.
 export const withInteractions = Component => props => {

package/dist/withInteractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"withInteractions.js","sourceRoot":"","sources":["../src/withInteractions.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,2FAA2F;AAC3F,yFAAyF;AACzF,MAAM,CAAC,MAAM,gBAAgB,GAAG,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;IACjD,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAA;IAE9D,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,QAAQ,IAAI,KAAK,CAAC,EAAE,CAAA;IAE3C,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CACH,gDAAqC,GAAG,YACpC,KAAC,SAAS,OAAK,KAAK,GAAI,GACT,CACtB,CAAA;IACL,CAAC;IACD,OAAO,KAAC,SAAS,OAAK,KAAK,GAAI,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"withInteractions.js","sourceRoot":"","sources":["../src/withInteractions.tsx"],"names":[],"mappings":";AACA,oGAAoG;AACpG,gCAAgC;AAChC,qFAAqF;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,2GAA2G;AAC3G,yGAAyG;AACzG,uGAAuG;AACvG,0GAA0G;AAC1G,iHAAiH;AACjH,oDAAoD;AACpD,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAC/C,gCAAgC,CACnC,CAAA;AAED,2FAA2F;AAC3F,yFAAyF;AACzF,MAAM,CAAC,MAAM,gBAAgB,GAAG,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;IACjD,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAA;IAE9D,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,QAAQ,IAAI,KAAK,CAAC,EAAE,CAAA;IAE3C,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CACH,gDAAqC,GAAG,YACpC,KAAC,SAAS,OAAK,KAAK,GAAI,GACT,CACtB,CAAA;IACL,CAAC;IACD,OAAO,KAAC,SAAS,OAAK,KAAK,GAAI,CAAA;AACnC,CAAC,CAAA"}

package/dist/withOrigami.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { isBinding, resolve } from './bindings';
+import { useSvgSources } from './svg';
 // Resolve the authored props (reading the hooks they bind to), render the real component.
 export const withOrigami = (Component) => {
     const W = (props) => {
@@ -8,7 +9,7 @@ export const withOrigami = (Component) => {
                 throw new Error(`${k}: a callback has no spelling (ADR-0015); fn() would run at render`);
             }
         }
-        const resolved = resolve(props);
+        const resolved = useSvgSources(resolve(props));
         return _jsx(Component, { ...resolved });
     };
     W.displayName = `Origami(${Component.displayName ?? Component.name})`;

package/dist/withOrigami.js.map

@@ -1 +1 @@
-{"version":3,"file":"withOrigami.js","sourceRoot":"","sources":["../src/withOrigami.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE/C,0FAA0F;AAC1F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAmB,SAA2B,EAAwB,EAAE;IAC/F,MAAM,CAAC,GAAyB,CAAC,KAAQ,EAAE,EAAE;QACzC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACpE,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAA;YAC5F,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAM,CAAA;QACpC,OAAO,KAAC,SAAS,OAAK,QAAQ,GAAI,CAAA;IACtC,CAAC,CAAA;IACD,CAAC,CAAC,WAAW,GAAG,WAAW,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,GAAG,CAAA;IACrE,OAAO,CAAC,CAAA;AACZ,CAAC,CAAA"}
+{"version":3,"file":"withOrigami.js","sourceRoot":"","sources":["../src/withOrigami.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAErC,0FAA0F;AAC1F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAmB,SAA2B,EAAwB,EAAE;IAC/F,MAAM,CAAC,GAAyB,CAAC,KAAQ,EAAE,EAAE;QACzC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACpE,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAA;YAC5F,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAM,CAAC,CAAA;QACnD,OAAO,KAAC,SAAS,OAAK,QAAQ,GAAI,CAAA;IACtC,CAAC,CAAA;IACD,CAAC,CAAC,WAAW,GAAG,WAAW,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,GAAG,CAAA;IACrE,OAAO,CAAC,CAAA;AACZ,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-runtime",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "description": "React runtime for Origami-generated component wrappers: context bindings, providers, and className resolution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,6 @@
     "@types/react": "^18.3.1",
     "@wix/services-manager": "^1.0.7",
     "@wix/services-manager-react": "^1.0.8",
-    "@wix/site-service-interactions": "^1.0.28",
     "jsdom": "^23.0.1",
     "react": "^18.3.1",
     "typescript": "^6.0.3",
@@ -29,7 +28,6 @@
   "peerDependencies": {
     "@wix/services-manager": "^1.0.7",
     "@wix/services-manager-react": "^1.0.8",
-    "@wix/site-service-interactions": "^1.0.28",
     "react": "^18.3.1"
   },
   "publishUnscoped": false,
@@ -61,5 +59,5 @@
     }
   },
   "type": "module",
-  "falconPackageHash": "9832fc171b32f1c1c561fe7a7697e74d239d6147aa28d124085769b9"
+  "falconPackageHash": "1c7fa2cc4ad12662e15197def92c2d8b0e865371bf526813bc8c0933"
 }