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 props bugs (#1955)
Bogdan Chadkin14baeb5c8563
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.tsindex d2a698707d..7fe02ce76f 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts@@ -204,13 +204,15 @@ export const usePropsLogic = ({// we will delete items from these maps as we categorize the propsconst unprocessedSaved = new Map(savedProps.map((prop) => [prop.name, prop]));- const unprocessedKnown = new Map(Object.entries(meta.props));+ const unprocessedKnown = new Map<Prop["name"], PropMeta>(+ Object.entries(meta.props)+ );const initialPropsNames = new Set(meta.initialProps ?? []);const systemProps = systemPropsMeta.map(({ name, meta }) => {let saved = getAndDelete<Prop>(unprocessedSaved, name);- if (saved === undefined) {+ if (saved === undefined && meta.defaultValue !== undefined) {saved = getStartingProp(instance.id, meta, name);}getAndDelete(unprocessedKnown, name);@@ -242,7 +244,7 @@ export const usePropsLogic = ({// - where 0 is a fallback when no default is available// - they think that width is set to 0, but it's actually not set at all//- if (prop === undefined) {+ if (prop === undefined && known.defaultValue !== undefined) {prop = getStartingProp(instance.id, known, name);}@@ -273,7 +275,7 @@ export const usePropsLogic = ({known = getDefaultMetaForType(saved.type);}- initialProps.push({ prop: saved, propName: name, meta: known });+ addedProps.push({ prop: saved, propName: name, meta: known });}const handleAdd = (propName: string) => {diff --git a/packages/generate-arg-types/src/types.ts b/packages/generate-arg-types/src/types.tsindex de8f681e91..fa1f4363bb 100644--- a/packages/generate-arg-types/src/types.ts+++ b/packages/generate-arg-types/src/types.ts@@ -159,6 +159,7 @@ const Action = z.object({...common,control: z.literal("action"),type: z.literal("action"),+ defaultValue: z.undefined().optional(),});export const PropMeta = z.union([diff --git a/packages/image/src/image.tsx b/packages/image/src/image.tsxindex 1aea0addda..fe92ba02cd 100644--- a/packages/image/src/image.tsx+++ b/packages/image/src/image.tsx@@ -43,10 +43,6 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, ImageProps>(});-Image.defaultProps = {- src: "",-};-Image.displayName = "Image";const imagePlaceholderSvg = `data:image/svg+xml;base64,${btoa(`<svgdiff --git a/packages/sdk-components-react/src/__generated__/image.props.ts b/packages/sdk-components-react/src/__generated__/image.props.tsindex ce347cae2d..bc91c46d2f 100644--- a/packages/sdk-components-react/src/__generated__/image.props.ts+++ b/packages/sdk-components-react/src/__generated__/image.props.ts@@ -415,6 +415,7 @@ export const props: Record<string, PropMeta> = {required: false,control: "radio",type: "string",+ defaultValue: "lazy",options: ["eager", "lazy"],},nonce: { required: false, control: "text", type: "string" },diff --git a/packages/sdk-components-react/src/image.tsx b/packages/sdk-components-react/src/image.tsxindex a89ac30130..d1aabdafa6 100644--- a/packages/sdk-components-react/src/image.tsx+++ b/packages/sdk-components-react/src/image.tsx@@ -44,7 +44,7 @@ const imagePlaceholderSvg = `data:image/svg+xml;base64,${btoa(`<svgtype Props = Omit<ComponentPropsWithoutRef<typeof WebstudioImage>, "loader">;export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(- (props, ref) => {+ ({ loading = "lazy", ...props }, ref) => {const { imageBaseUrl } = useContext(ReactSdkContext);const asset = usePropAsset(getInstanceIdFromComponentProps(props), "src");@@ -56,7 +56,13 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(if (asset == null || loader == null) {return (- <img key={src} {...props} src={src || imagePlaceholderSvg} ref={ref} />+ <img+ key={src}+ loading={loading}+ {...props}+ src={src || imagePlaceholderSvg}+ ref={ref}+ />);}@@ -72,6 +78,7 @@ export const Image = forwardRef<ElementRef<typeof defaultTag>, Props>(* prevents showing outdated images on route change.**/key={src}+ loading={loading}{...props}loader={loader}src={src}