Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Fix ssr error (#1820)

Ivan Starkove31ed7908a62
diff --git a/packages/css-vars/src/index.ts b/packages/css-vars/src/index.ts
index 8477c5593f..48a4806ac7 100644
--- a/packages/css-vars/src/index.ts
+++ b/packages/css-vars/src/index.ts
@@ -1,34 +1,19 @@
-let counter = -1;
+/**
+ * To reduce probability of intersection with any existing CSS variables
+ */
+const CSS_VARIABLE_POSTFIX = "-w7ovd";
-const unique = <Name extends string>(name: Name) => {
- return `${name}-${++counter}` as const;
-};
+const cssVarsSet = new Set<string>();
-const define = <Name extends string>(name: Name, unique = false) => {
- if (unique) {
- return `--${name}` as const;
+const define = <Name extends string>(name: Name) => {
+ if (cssVarsSet.has(name)) {
+ throw new Error(`Variable ${name} already defined`);
}
- return `--${name}-${++counter}` as const;
-};
-
-type AppendString<
- TResult extends string,
- TDelimiter extends string,
- TNextPart extends string
-> = TResult extends "" ? TNextPart : `${TResult}${TDelimiter}${TNextPart}`;
+ cssVarsSet.add(name);
-type Join<
- TInput extends readonly string[],
- TDelimiter extends string,
- TResult extends string = ""
-> = TInput extends []
- ? TResult
- : TInput extends [string, ...infer Rest extends string[]]
- ? Join<Rest, TDelimiter, AppendString<TResult, TDelimiter, TInput[0]>>
- : never;
-
-const use = <Args extends string[]>(...args: Args) => {
- return `var(${args.join(", ") as Join<Args, ", ">})` as const;
+ return `--${name}${CSS_VARIABLE_POSTFIX}` as const;
};
-export const cssVars = { define, use, unique };
+const use = (...args: string[]) => `var(${args.join(", ")})`;
+
+export const cssVars = { define, use };
diff --git a/packages/sdk-components-react/src/code-text.tsx b/packages/sdk-components-react/src/code-text.tsx
index e15c2f2bf0..c091c76dfa 100644
--- a/packages/sdk-components-react/src/code-text.tsx
+++ b/packages/sdk-components-react/src/code-text.tsx
@@ -8,10 +8,10 @@ import { cssVars } from "@webstudio-is/css-vars";
export const defaultTag = "code";
-export const displayVarNamespace = cssVars.unique("code-display");
+export const displayVarNamespace = cssVars.define("code-display");
const blockStyle = {
- [cssVars.define(displayVarNamespace, true)]: "block",
+ [cssVars.define(displayVarNamespace)]: "block",
};
type Props = Omit<ComponentProps<typeof defaultTag>, "inline"> & {