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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Skip unsafe attribute names on generation (#4216)
Ivan Starkovf1aa37cdfbf2
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex 57727c13d8..9b0044d4e6 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -9,7 +9,10 @@ import {Flex,Box,} from "@webstudio-is/design-system";-import { descendantComponent } from "@webstudio-is/react-sdk";+import {+ descendantComponent,+ isAttributeNameSafe,+} from "@webstudio-is/react-sdk";import {$propValuesByInstanceSelector,$propsIndex,@@ -21,7 +24,6 @@ import { renderControl } from "../controls/combined";import { usePropsLogic, type PropAndMeta } from "./use-props-logic";import { Row } from "../shared";import { serverSyncStore } from "~/shared/sync";-import { isAttributeNameSafe } from "~/shared/dom-utils";type Item = {name: string;diff --git a/apps/builder/app/shared/dom-utils.ts b/apps/builder/app/shared/dom-utils.tsindex 567274aa58..d8c591b474 100644--- a/apps/builder/app/shared/dom-utils.ts+++ b/apps/builder/app/shared/dom-utils.ts@@ -192,39 +192,3 @@ export const getAllElementsBoundingBox = (elements: Element[]): DOMRect => {width: right - left,});};--/**- * Copyright (c) Meta Platforms, Inc. and affiliates.- *- * This source code is licensed under the MIT license found in the- * LICENSE file in the root directory of this source tree.- *- * https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/shared/isAttributeNameSafe.js- */-const attributeNameStartChar =- ":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";-const attributeNameChar =- attributeNameStartChar + "\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";--const validAttributeNameRegex = new RegExp(- // eslint-disable-next-line no-misleading-character-class- "^[" + attributeNameStartChar + "][" + attributeNameChar + "]*$"-);--const illegalAttributeNameCache = new Map<string, boolean>();-const validatedAttributeNameCache = new Map<string, boolean>();--export const isAttributeNameSafe = (attributeName: string) => {- if (validatedAttributeNameCache.has(attributeName)) {- return true;- }- if (illegalAttributeNameCache.has(attributeName)) {- return false;- }- if (validAttributeNameRegex.test(attributeName)) {- validatedAttributeNameCache.set(attributeName, true);- return true;- }- illegalAttributeNameCache.set(attributeName, true);- return false;-};diff --git a/packages/react-sdk/src/component-generator.test.tsx b/packages/react-sdk/src/component-generator.test.tsxindex f99fed98f7..f9ca7975cf 100644--- a/packages/react-sdk/src/component-generator.test.tsx+++ b/packages/react-sdk/src/component-generator.test.tsx@@ -948,3 +948,54 @@ test("generate resource prop", () => {"`);});++test("skip unsafe properties", () => {+ expect(+ generateWebstudioComponent({+ classesMap: new Map(),+ scope: createScope(),+ name: "Page",+ rootInstanceId: "body",+ parameters: [],+ dataSources: new Map(),+ indexesWithinAncestors: new Map(),++ instances: toMap([+ { type: "instance", id: "body", component: "Body", children: [] },+ ]),+ props: toMap([+ {+ id: "unsafeProp",+ instanceId: "body",+ name: "",+ type: "string",+ value: "unsafe",+ },++ {+ id: "unsafeProp-2",+ instanceId: "body",+ name: "1-numeric-unsafe",+ type: "string",+ value: "unsafe",+ },++ {+ id: "unsafeProp-3",+ instanceId: "body",+ name: "click.prevent",+ type: "string",+ value: "unsafe",+ },+ ]),+ })+ ).toEqual(+ validateJSX(+ clear(`+ const Page = () => {+ return <Body />+ }+ `)+ )+ );+});diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 3cc6e65778..1f7bf8846b 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -13,7 +13,7 @@ import {decodeDataSourceVariable,transpileExpression,} from "@webstudio-is/sdk";-import { indexAttribute, showAttribute } from "./props";+import { indexAttribute, isAttributeNameSafe, showAttribute } from "./props";import { collectionComponent, descendantComponent } from "./core-components";import type { IndexesWithinAncestors } from "./instance-utils";@@ -181,6 +181,11 @@ export const generateJsxElement = ({dataSources,usedDataSources,});++ if (isAttributeNameSafe(prop.name) === false) {+ continue;+ }+// show prop controls conditional rendering and need to be handled separatelyif (prop.name === showAttribute) {// prevent generating unnecessary conditiondiff --git a/packages/react-sdk/src/props.test.ts b/packages/react-sdk/src/props.test.tsindex 9cbb5d9756..dadd8c2790 100644--- a/packages/react-sdk/src/props.test.ts+++ b/packages/react-sdk/src/props.test.ts@@ -1,6 +1,6 @@-import { test, expect } from "@jest/globals";+import { test, expect, describe } from "@jest/globals";import type { Pages, Prop } from "@webstudio-is/sdk";-import { normalizeProps } from "./props";+import { isAttributeNameSafe, normalizeProps } from "./props";const pagesBase: Pages = {meta: {},@@ -289,3 +289,30 @@ test("normalize page prop with path and hash into string", () => {idProp,]);});++describe("isAttributeNameSafe", () => {+ test("should return true for valid attribute names", () => {+ expect(isAttributeNameSafe("data-test")).toBe(true);+ expect(isAttributeNameSafe("aria-label")).toBe(true);+ expect(isAttributeNameSafe("class")).toBe(true);+ expect(isAttributeNameSafe("ns:class")).toBe(true);+ });++ test("should return false for invalid attribute names", () => {+ expect(isAttributeNameSafe("123class")).toBe(false);+ expect(isAttributeNameSafe("class.name")).toBe(false);+ expect(isAttributeNameSafe(":bad")).toBe(false);+ expect(isAttributeNameSafe(" ")).toBe(false);+ expect(isAttributeNameSafe("hello world")).toBe(false);+ });++ test("should return true for cached valid attribute names", () => {+ isAttributeNameSafe("data-cached");+ expect(isAttributeNameSafe("data-cached")).toBe(true);+ });++ test("should return false for cached invalid attribute names", () => {+ isAttributeNameSafe("1-invalid-cached");+ expect(isAttributeNameSafe("1-invalid-cached")).toBe(false);+ });+});diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.tsindex 27dc1f29bd..8fdf2d05d3 100644--- a/packages/react-sdk/src/props.ts+++ b/packages/react-sdk/src/props.ts@@ -129,3 +129,41 @@ export const showAttribute = "data-ws-show" as const;export const indexAttribute = "data-ws-index" as const;export const collapsedAttribute = "data-ws-collapsed" as const;export const textContentAttribute = "data-ws-text-content" as const;++/**+ * Copyright (c) Meta Platforms, Inc. and affiliates.+ *+ * This source code is licensed under the MIT license found in the+ * LICENSE file in the root directory of this source tree.+ *+ * https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/shared/isAttributeNameSafe.js+ */+const attributeNameStartChar =+ "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";+// original: ":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";+const attributeNameChar =+ attributeNameStartChar + ":\\-0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";+// original: attributeNameStartChar + "\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";++const validAttributeNameRegex = new RegExp(+ // eslint-disable-next-line no-misleading-character-class+ "^[" + attributeNameStartChar + "][" + attributeNameChar + "]*$"+);++const illegalAttributeNameCache = new Map<string, boolean>();+const validatedAttributeNameCache = new Map<string, boolean>();++export const isAttributeNameSafe = (attributeName: string) => {+ if (validatedAttributeNameCache.has(attributeName)) {+ return true;+ }+ if (illegalAttributeNameCache.has(attributeName)) {+ return false;+ }+ if (validAttributeNameRegex.test(attributeName)) {+ validatedAttributeNameCache.set(attributeName, true);+ return true;+ }+ illegalAttributeNameCache.set(attributeName, true);+ return false;+};