@wix/origami-runtime 0.19.12 → 0.20.1

package/dist/classNames.d.ts

@@ -1,4 +1,6 @@
 export type Cond = unknown;
 export type ClassNames = string | Record<string, Cond | readonly Cond[]> | readonly ClassNames[] | undefined;
 export declare const cx: (block: string, value: ClassNames) => string;
-export declare const rootClass: (id: string, value: ClassNames) => string;
+export type RootClassName = string | readonly [string, ...ClassNames[]] | undefined;
+export declare const componentClassOf: (className: RootClassName) => string | undefined;
+export declare const rootClass: (id: string | undefined, className: RootClassName) => string;

package/dist/classNames.js

@@ -19,5 +19,10 @@ export const cx = (block, value) => {
     walk(value);
     return out.join(' ');
 };
-export const rootClass = (id, value) => [id, cx(id, value)].filter(Boolean).join(' ');
+export const componentClassOf = (className) => typeof className === 'string' ? className.split(' ')[0] : className?.[0];
+export const rootClass = (id, className) => {
+    const [block = id ?? '', ...states] = typeof className === 'string' ? [className] : (className ?? []);
+    const names = `${id ?? ''} ${block} ${cx(block, states)}`.split(/\s+/).filter(Boolean);
+    return [...new Set(names)].join(' ');
+};
 //# sourceMappingURL=classNames.js.map

package/dist/classNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"classNames.js","sourceRoot":"","sources":["../src/classNames.ts"],"names":[],"mappings":"AAMA,MAAM,EAAE,GAAG,CAAC,CAAyB,EAAW,EAAE,CAC9C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;AAE5E,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,IAAY,EAAU,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,EAAE,CAAC,CAAA;AAEvH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,KAAiB,EAAU,EAAE;IAC3D,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,CAAC,CAAa,EAAQ,EAAE;QACjC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAM;QAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ;YACrB,OAAO,KAAK,CAAC;iBACR,KAAK,CAAC,KAAK,CAAC;iBACZ,MAAM,CAAC,OAAO,CAAC;iBACf,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACjD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAyB,CAAC;YAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvG,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,CAAC,CAAA;IACX,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,KAAiB,EAAU,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA"}
+{"version":3,"file":"classNames.js","sourceRoot":"","sources":["../src/classNames.ts"],"names":[],"mappings":"AAMA,MAAM,EAAE,GAAG,CAAC,CAAyB,EAAW,EAAE,CAC9C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;AAE5E,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,IAAY,EAAU,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,EAAE,CAAC,CAAA;AAEvH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,KAAiB,EAAU,EAAE;IAC3D,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,CAAC,CAAa,EAAQ,EAAE;QACjC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAM;QAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ;YACrB,OAAO,KAAK,CAAC;iBACR,KAAK,CAAC,KAAK,CAAC;iBACZ,MAAM,CAAC,OAAO,CAAC;iBACf,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACjD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAyB,CAAC;YAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvG,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,CAAC,CAAA;IACX,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,SAAwB,EAAsB,EAAE,CAC7E,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;AAE5E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAsB,EAAE,SAAwB,EAAU,EAAE;IAClF,MAAM,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IACrG,MAAM,KAAK,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACtF,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -9,6 +9,6 @@ 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 type { ClassNames, Cond, RootClassName } from './classNames';
 export { prop, defineComponent } from './define';
 export type { WixProps, WixElementProps, PropBuilder, ComponentDefinition, InferProps, Image, RichText, Video } from './define';

package/dist/withInteractions.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InteractionsDefinition } from '@wix/site-service-interactions/definition';
 import { useService } from '@wix/services-manager-react';
+import { componentClassOf } from './classNames';
 // 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.
+// interactions renders inside an <interact-element> keyed by its comp path, else its component class.
 export const withInteractions = (Component) => props => {
     const { hasInteractions } = useService(InteractionsDefinition);
-    const { id, wix } = props;
-    const key = wix?.compPath ?? id;
+    const { className, wix } = props;
+    const key = wix?.compPath ?? componentClassOf(className);
     if (key !== undefined && hasInteractions(key)) {
         return (_jsx("interact-element", { "data-interact-key": key, children: _jsx(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,CAAmB,SAA2B,EAAwB,EAAE,CAAC,KAAK,CAAC,EAAE;IAC7G,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAA;IAE9D,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,KAAqD,CAAA;IACzE,MAAM,GAAG,GAAG,GAAG,EAAE,QAAQ,IAAI,EAAE,CAAA;IAE/B,IAAI,GAAG,KAAK,SAAS,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5C,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,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAsB,MAAM,cAAc,CAAA;AAEnE,2FAA2F;AAC3F,sGAAsG;AACtG,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAmB,SAA2B,EAAwB,EAAE,CAAC,KAAK,CAAC,EAAE;IAC7G,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAA;IAE9D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAmE,CAAA;IAC9F,MAAM,GAAG,GAAG,GAAG,EAAE,QAAQ,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAExD,IAAI,GAAG,KAAK,SAAS,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5C,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-runtime",
-  "version": "0.19.12",
+  "version": "0.20.1",
   "description": "React runtime for Origami-generated component wrappers: context bindings, providers, and className resolution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -61,5 +61,5 @@
     }
   },
   "type": "module",
-  "falconPackageHash": "b261ac68f33db98f90f9828d54576f1b80950b2137cef64fd6a380d7"
+  "falconPackageHash": "a6dafda18b692b62249be1ec53866333ed7029e111947f6d094a1d72"
 }