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
experimental: marketplace for templates (#2916)
Oleg Isonendd425afd6d9d
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsxindex 3b3bb0d239..5b71f3f015 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx@@ -16,4 +16,4 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {);};-export const icon = <ImageIcon />;+export const Icon = ImageIcon;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex bd531d9fac..ca9104b777 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -26,6 +26,7 @@ import { MetaIcon } from "~/builder/shared/meta-icon";import { $registeredComponentMetas } from "~/shared/nano-states";import { getMetaMaps } from "./get-meta-maps";import { getInstanceLabel } from "~/shared/instance-utils";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {const metaByComponentName = useStore($registeredComponentMetas);@@ -61,7 +62,20 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {/><ScrollArea>{componentCategories- .filter((category) => category !== "hidden")+ .filter((category) => {+ if (category === "hidden") {+ return false;+ }++ if (+ category === "utilities" &&+ isFeatureEnabled("marketplace") === false+ ) {+ return false;+ }++ return true;+ }).map((category) => (<CollapsibleSection label={category} key={category} fullWidth><ArrowFocus@@ -106,4 +120,4 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {);};-export const icon = <PlusIcon />;+export const Icon = PlusIcon;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/index.tsindex 7938123c7f..0e66b8ccac 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/index.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/index.ts@@ -2,12 +2,15 @@ import * as components from "./components";import * as navigator from "./navigator";import * as assets from "./assets";import * as pages from "./pages";+import * as marketplace from "./marketplace";import type { TabContentProps, TabName } from "../types";import type { ReactNode } from "react";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import type { IconComponent } from "@webstudio-is/icons";type PanelExports = {TabContent: (props: TabContentProps) => ReactNode;- icon: ReactNode;+ Icon: IconComponent;};export const panels = new Map<TabName, PanelExports>([@@ -16,3 +19,7 @@ export const panels = new Map<TabName, PanelExports>([["navigator", navigator],["assets", assets],]);++if (isFeatureEnabled("marketplace")) {+ panels.set("marketplace", marketplace);+}diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/index.tsnew file mode 100644index 0000000000..8b8e96a783--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/index.ts@@ -0,0 +1 @@+export * from "./tab";diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsxnew file mode 100644index 0000000000..7bdcb6a8da--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx@@ -0,0 +1,127 @@+import { useMemo } from "react";+import { useStore } from "@nanostores/react";+import {+ Flex,+ List,+ ListItem,+ ScrollArea,+ Text,+ focusRingStyle,+ rawTheme,+ theme,+} from "@webstudio-is/design-system";+import { CollapsibleSection } from "~/builder/shared/collapsible-section";+import { $products, categories } from "./utils";+import type { MarketplaceProduct } from "./schema";+import { LoadingDotsIcon } from "@webstudio-is/icons";++const getProductsByCategory = (products: Array<MarketplaceProduct>) => {+ const productsByCategory = new Map<+ MarketplaceProduct["category"],+ Array<MarketplaceProduct>+ >();++ for (const product of products) {+ if (+ categories.some((category) => category.category === product.category) ===+ false+ ) {+ throw new Error(`Unknown category: ${product.category}`);+ }+ let categoryItems = productsByCategory.get(product.category);+ if (categoryItems === undefined) {+ categoryItems = [];+ productsByCategory.set(product.category, categoryItems);+ }+ categoryItems.push(product);+ }+ return productsByCategory;+};++const focusOutline = focusRingStyle();++const Product = ({+ product,+ isLoading,+ ...props+}: {+ product: MarketplaceProduct;+ isLoading: boolean;+}) => {+ return (+ <Flex+ {...props}+ css={{+ position: "relative",+ height: theme.spacing[13],+ px: theme.spacing[9],+ outline: "none",+ "&:focus-visible": focusOutline,+ "&:hover": focusOutline,+ }}+ align="center"+ justify="between"+ >+ <Flex align="center" gap="2">+ <img+ src={`${new URL(product.publishedUrl).origin}/favicon.ico`}+ style={{ width: rawTheme.spacing[11], height: rawTheme.spacing[11] }}+ aria-disabled+ />+ <Text variant="labelsSentenceCase" truncate>+ {product.label}+ </Text>+ </Flex>+ {isLoading && <LoadingDotsIcon style={{ flexShrink: 0 }} />}+ </Flex>+ );+};++export const Marketplace = ({+ activeProduct,+ onSelect,+}: {+ activeProduct?: MarketplaceProduct;+ onSelect: (product: MarketplaceProduct) => void;+}) => {+ const products = useStore($products);+ const productsByCategory = useMemo(+ () => new Map(getProductsByCategory(products)),+ [products]+ );+ return (+ <ScrollArea>+ {categories.map(({ category, label }) => {+ const products = productsByCategory.get(category);+ if (products === undefined || products.length === 0) {+ return;+ }+ return (+ <CollapsibleSection label={label} key={category} fullWidth>+ <List asChild>+ <Flex direction="column">+ {products.map((product: MarketplaceProduct, index) => {+ return (+ <ListItem+ asChild+ key={product.id}+ index={index}+ onSelect={() => {+ onSelect(product);+ }}+ >+ <Product+ product={product}+ isLoading={product.id === activeProduct?.id}+ />+ </ListItem>+ );+ })}+ </Flex>+ </List>+ </CollapsibleSection>+ );+ })}+ </ScrollArea>+ );+};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/products.json b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/products.jsonnew file mode 100644index 0000000000..de69545120--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/products.json@@ -0,0 +1,9 @@+[+ {+ "category": "templates",+ "label": "CIQ Library Lite",+ "publishedUrl": "https://launchpads-style-guide-c4i72.wstd.io",+ "authToken": "e41a0452-a468-416c-a4da-13590db1821a",+ "projectId": "bc5f0c98-a6b0-4544-9b3f-9ae06664c036"+ }+]diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/schema.ts b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/schema.tsnew file mode 100644index 0000000000..afbe451e67--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/schema.ts@@ -0,0 +1,17 @@+import { z } from "zod";++const Base = z.object({+ id: z.string(),+ label: z.string(),+ publishedUrl: z.string(),+ authToken: z.string(),+ projectId: z.string(),+});++const TemplatesProduct = Base.extend({+ category: z.literal("templates"),+});++// Will add an AppProduct later.+export const MarketplaceProduct = TemplatesProduct;+export type MarketplaceProduct = z.infer<typeof MarketplaceProduct>;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/tab.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/tab.tsxnew file mode 100644index 0000000000..a863c29e5c--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/tab.tsx@@ -0,0 +1,53 @@+import { ExtensionIcon } from "@webstudio-is/icons";+import { Flex } from "@webstudio-is/design-system";+import type { TabContentProps } from "../../types";+import { Header, CloseButton } from "../../header";+import { Marketplace } from "./marketplace";+import { Templates } from "./template";+import { builderPath } from "~/shared/router-utils";+import { useFetcher } from "@remix-run/react";+import { useState } from "react";+import type { MarketplaceProduct } from "./schema";+import { toWebstudioData } from "./utils";++export const TabContent = ({ onSetActiveTab }: TabContentProps) => {+ const [activeProduct, setActiveProduct] = useState<MarketplaceProduct>();+ const { load, data } = useFetcher();++ const handleOpenChange = (isOpen: boolean) => {+ if (isOpen === false) {+ setActiveProduct(undefined);+ }+ };++ return (+ <Flex direction="column" css={{ height: "100%" }}>+ <Header+ title="Marketplace"+ suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}+ />+ {activeProduct && data ? (+ <Templates+ product={activeProduct}+ data={toWebstudioData(data)}+ onOpenChange={handleOpenChange}+ />+ ) : (+ <Marketplace+ activeProduct={activeProduct}+ onSelect={(product) => {+ setActiveProduct(product);+ load(+ builderPath({+ projectId: product.projectId,+ authToken: product.authToken,+ })+ );+ }}+ />+ )}+ </Flex>+ );+};++export const Icon = ExtensionIcon;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/template.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/template.tsxnew file mode 100644index 0000000000..414d8fc157--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/template.tsx@@ -0,0 +1,221 @@+import {+ Button,+ Flex,+ List,+ ListItem,+ ScrollArea,+ Separator,+ Text,+ theme,+ focusRingStyle,+ css,+} from "@webstudio-is/design-system";+import { ChevronLeftIcon } from "@webstudio-is/icons";+import { insert } from "./utils";+import { computeExpression } from "~/shared/nano-states";+import { CollapsibleSection } from "~/builder/shared/collapsible-section";+import type { Asset, WebstudioData } from "@webstudio-is/sdk";+import { useMemo } from "react";+import env from "~/shared/env";+import { Image, createImageLoader } from "@webstudio-is/image";+import type { MarketplaceProduct } from "./schema";++const focusOutline = focusRingStyle();++const imageLoader = createImageLoader({+ imageBaseUrl: env.IMAGE_BASE_URL,+});++const imageContainerStyle = css({+ position: "relative",+ overflow: "hidden",+ aspectRatio: "1.91",+});++const imageStyle = css({+ position: "absolute",+ top: 0,+ width: "100%",+ height: "100%",+ objectFit: "cover",+ transition: "transform 100ms",+ "&:hover": {+ transform: "scale(1.1)",+ },+});++const Thumbnail = ({+ asset,+ imageUrl,+}: {+ asset?: Asset;+ imageUrl?: string;+}) => {+ return (+ <div className={imageContainerStyle()}>+ {imageUrl && <img src={imageUrl} className={imageStyle()} />}+ {asset && (+ <Image src={asset.name} loader={imageLoader} className={imageStyle()} />+ )}+ </div>+ );+};++type TemplateData = {+ socialImageAsset?: Asset;+ socialImageUrl?: string;+ title?: string;+ rootInstanceId: string;+};++const Template = ({+ data: { socialImageAsset, socialImageUrl, title },+ ...listItemProps+}: {+ data: TemplateData;+}) => {+ return (+ <Flex+ {...listItemProps}+ direction="column"+ css={{+ px: theme.spacing[9],+ py: theme.spacing[5],+ position: "relative",+ overflow: "hidden",+ outline: "none",+ "&:hover": focusOutline,+ "&:focus-visible": focusOutline,+ }}+ gap="1"+ >+ <Thumbnail asset={socialImageAsset} imageUrl={socialImageUrl} />+ {title && <Text truncate>{title}</Text>}+ </Flex>+ );+};++// Special meta properties for the marketplace+const marketplaceMeta = {+ category: "ws:category",+ title: "ws:title",+};++const getTemplatesDataByCategory = (data?: WebstudioData) => {+ const templatesByCategory = new Map<string, Array<TemplateData>>();++ if (data === undefined) {+ return templatesByCategory;+ }++ // In the future we could support bindings in the store as well.+ const variableValues = new Map();++ for (const page of data.pages.pages) {+ let category = page.meta.custom?.find(+ ({ property }) => property === marketplaceMeta.category+ )?.content;+ if (category !== undefined) {+ category = computeExpression(category, variableValues);+ }+ if (category !== undefined) {+ let templates = templatesByCategory.get(category);+ if (templates === undefined) {+ templates = [];+ templatesByCategory.set(category, templates);+ }++ const socialImageUrl = page.meta.socialImageUrl+ ? String(computeExpression(page.meta.socialImageUrl, variableValues))+ : undefined;+ const socialImageAsset = page.meta.socialImageAssetId+ ? data.assets.get(page.meta.socialImageAssetId)+ : undefined;++ let title = page.meta.custom?.find(+ ({ property }) => property === marketplaceMeta.title+ )?.content;+ if (title !== undefined) {+ title = computeExpression(title, variableValues);+ }+ if (title === undefined || title === "") {+ title = computeExpression(page.title, variableValues);+ }++ templates.push({+ title,+ socialImageUrl,+ socialImageAsset,+ rootInstanceId: page.rootInstanceId,+ });+ }+ }+ return templatesByCategory;+};++export const Templates = ({+ product,+ data,+ onOpenChange,+}: {+ product: MarketplaceProduct;+ data: WebstudioData;+ onOpenChange: (isOpen: boolean) => void;+}) => {+ const templatesDataByCategory = useMemo(+ () => getTemplatesDataByCategory(data),+ [data]+ );++ if (templatesDataByCategory === undefined || data === undefined) {+ return;+ }++ return (+ <Flex direction="column" css={{ height: "100%" }}>+ <Flex align="center" css={{ px: theme.spacing[9], py: theme.spacing[5] }}>+ <Button+ prefix={<ChevronLeftIcon />}+ onClick={() => {+ onOpenChange(false);+ }}+ color="neutral"+ >+ {product.label}+ </Button>+ </Flex>+ <Separator />+ <ScrollArea>+ {Array.from(templatesDataByCategory.keys()).map((category) => {+ return (+ <CollapsibleSection label={category} key={category} fullWidth>+ <List asChild>+ <Flex direction="column">+ {templatesDataByCategory+ .get(category)+ ?.map((templateData, index) => {+ return (+ <ListItem+ asChild+ key={templateData.rootInstanceId}+ index={index}+ onSelect={() => {+ insert({+ instanceId: templateData.rootInstanceId,+ data,+ });+ }}+ >+ <Template data={templateData} />+ </ListItem>+ );+ })}+ </Flex>+ </List>+ </CollapsibleSection>+ );+ })}+ </ScrollArea>+ </Flex>+ );+};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.tsnew file mode 100644index 0000000000..248c51ca5b--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts@@ -0,0 +1,54 @@+import { atom } from "nanostores";+import {+ extractWebstudioFragment,+ findTargetAndInsertFragment,+} from "~/shared/instance-utils";+import type { WebstudioData } from "@webstudio-is/sdk";+import productsData from "./products.json";+import { MarketplaceProduct } from "./schema";+import type { BuilderProps } from "~/builder";++export const $activeProductData = atom<WebstudioData | undefined>();++export const $products = atom(+ productsData.map((product, index) =>+ MarketplaceProduct.parse({ ...product, id: String(index) })+ )+);++export const categories: Array<{+ category: MarketplaceProduct["category"];+ label: string;+}> = [{ category: "templates", label: "Templates" }];++export const toWebstudioData = (data: BuilderProps): WebstudioData => ({+ pages: data.build.pages,+ assets: new Map(data.assets),+ instances: new Map(data.build.instances),+ dataSources: new Map(data.build.dataSources),+ resources: new Map(data.build.resources),+ props: new Map(data.build.props),+ styleSourceSelections: new Map(data.build.styleSourceSelections),+ styleSources: new Map(data.build.styleSources),+ breakpoints: new Map(data.build.breakpoints),+ styles: new Map(data.build.styles),+});++/**+ * Insert page as a template.+ * - Currently only supports inserting everything from the body+ * - Could be extended to support children of some other instance e.g. Marketplace Item+ */+export const insert = ({+ instanceId,+ data,+}: {+ instanceId: string;+ data: WebstudioData;+}) => {+ const fragment = extractWebstudioFragment(data, instanceId);+ fragment.instances = fragment.instances.filter(+ (instance) => instance.component !== "Body"+ );+ findTargetAndInsertFragment(fragment);+};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsxindex 20886818f1..8ffbbad6cc 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx@@ -1,4 +1,4 @@-import { ListNestedIcon } from "@webstudio-is/icons";+import { NavigatorIcon } from "@webstudio-is/icons";import { Navigator } from "../../navigator";import type { TabContentProps } from "../../types";@@ -12,4 +12,4 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {);};-export const icon = <ListNestedIcon />;+export const Icon = NavigatorIcon;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.tsindex 2953307e2e..e1f4fbf18b 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts@@ -313,9 +313,9 @@ export const $pageRootScope = computed((editingPage, variableValuesByInstanceSelector, dataSources) => {const scope: Record<string, unknown> = {};const aliases = new Map<string, string>();- const variableValues = new Map<string, unknown>();+ const defaultValues = new Map<string, unknown>();if (editingPage === undefined) {- return { variableValues, scope, aliases };+ return { variableValues: defaultValues, scope, aliases };}const values = variableValuesByInstanceSelector.get(JSON.stringify([editingPage.rootInstanceId])@@ -331,7 +331,7 @@ export const $pageRootScope = computed(aliases.set(name, dataSource.name);}}- return { variableValues: values ?? variableValues, scope, aliases };+ return { variableValues: values ?? defaultValues, scope, aliases };});diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex 020f2d2f9c..7d52015249 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -439,4 +439,4 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {);};-export const icon = <PageIcon />;+export const Icon = PageIcon;diff --git a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsxindex a05f6b5e06..3b760ffc8c 100644--- a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx@@ -1,5 +1,5 @@import { useState } from "react";-import { Box, Tooltip } from "@webstudio-is/design-system";+import { Box, Tooltip, rawTheme } from "@webstudio-is/design-system";import { useSubscribe, type Publish } from "~/shared/pubsub";import { $dragAndDropState, $isPreviewMode } from "~/shared/nano-states";import { panels } from "./panels";@@ -47,7 +47,7 @@ const AiTabTrigger = () => {);}}>- <AiIcon />+ <AiIcon size={rawTheme.spacing[10]} /></SidebarTabsTrigger>);};@@ -67,7 +67,7 @@ const HelpTabTrigger = () => {aria-label="Ask for help"data-state={helpIsOpen ? "active" : undefined}>- <HelpIcon size={22} />+ <HelpIcon size={rawTheme.spacing[10]} /></SidebarTabsTrigger></HelpPopover.Trigger></Tooltip>@@ -87,7 +87,7 @@ const GithubTabTrigger = () => {);}}>- <BugIcon size={22} />+ <BugIcon size={rawTheme.spacing[10]} /></SidebarTabsTrigger></Tooltip>);@@ -121,18 +121,20 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {{isPreviewMode === false && (<><SidebarTabsList>- {Array.from(panels.keys()).map((tabName) => (- <SidebarTabsTrigger- key={tabName}- aria-label={tabName}- value={tabName}- onClick={() => {- setActiveTab(activeTab === tabName ? "none" : tabName);- }}- >- {tabName !== "none" && panels.get(tabName)?.icon}- </SidebarTabsTrigger>- ))}+ {Array.from(panels.entries()).map(([tabName, { Icon }]) => {+ return (+ <SidebarTabsTrigger+ key={tabName}+ aria-label={tabName}+ value={tabName}+ onClick={() => {+ setActiveTab(activeTab === tabName ? "none" : tabName);+ }}+ >+ <Icon size={rawTheme.spacing[10]} />+ </SidebarTabsTrigger>+ );+ })}<AiTabTrigger /></SidebarTabsList><Box css={{ borderRight: `1px solid ${theme.colors.borderMain}` }}>diff --git a/apps/builder/app/builder/features/sidebar-left/types.ts b/apps/builder/app/builder/features/sidebar-left/types.tsindex 8a74be4bee..bcc8696c18 100644--- a/apps/builder/app/builder/features/sidebar-left/types.ts+++ b/apps/builder/app/builder/features/sidebar-left/types.ts@@ -1,6 +1,12 @@import type { Publish } from "~/shared/pubsub";-export type TabName = "assets" | "components" | "navigator" | "pages" | "none";+export type TabName =+ | "assets"+ | "components"+ | "navigator"+ | "pages"+ | "marketplace"+ | "none";export type TabContentProps = {onSetActiveTab: (tabName: TabName) => void;diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex 3dd3b7d85e..2df9844824 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -44,6 +44,7 @@ import {$breakpoints,$pages,$resources,+ $selectedPage,} from "./nano-states";import {type DroppableTarget,@@ -402,6 +403,60 @@ export const insertInstanceChildrenMutable = (}};+export const findTargetAndInsertFragment = (fragment: WebstudioFragment) => {+ let isSuccess = false;++ const selectedPage = $selectedPage.get();+ if (selectedPage === undefined) {+ return isSuccess;+ }+ const metas = $registeredComponentMetas.get();+ const newInstances = new Map(+ fragment.instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceIds = fragment.children+ .filter((child) => child.type === "id")+ .map((child) => child.value);+ // paste to the root if nothing is selected+ const instanceSelector = $selectedInstanceSelector.get() ?? [+ selectedPage.rootInstanceId,+ ];+ const target = findClosestDroppableTarget(+ metas,+ $instances.get(),+ instanceSelector,+ computeInstancesConstraints(metas, newInstances, rootInstanceIds)+ );++ if (target === undefined) {+ return isSuccess;+ }++ updateWebstudioData((data) => {+ const { newInstanceIds } = insertWebstudioFragmentCopy({+ data,+ fragment,+ availableDataSources: findAvailableDataSources(+ data.dataSources,+ data.instances,+ instanceSelector+ ),+ });+ const newRootInstanceId = newInstanceIds.get(fragment.instances[0].id);+ if (newRootInstanceId === undefined) {+ isSuccess = false;+ return;+ }+ const children: Instance["children"] = [+ { type: "id", value: newRootInstanceId },+ ];+ insertInstanceChildrenMutable(data, children, target);+ isSuccess = true;+ });++ return isSuccess;+};+export const insertTemplateData = (templateData: WebstudioFragment,dropTarget: DroppableTargetdiff --git a/packages/design-system/src/components/focus-ring.ts b/packages/design-system/src/components/focus-ring.tsnew file mode 100644index 0000000000..ff9e023893--- /dev/null+++ b/packages/design-system/src/components/focus-ring.ts@@ -0,0 +1,18 @@+import { theme, type CSS } from "../stitches.config";++export const focusRingStyle = (style?: CSS) => ({+ "&::after": {+ content: '""',+ position: "absolute",+ left: theme.spacing[3],+ right: theme.spacing[3],+ top: theme.spacing[2],+ bottom: theme.spacing[2],+ outlineWidth: 2,+ outlineStyle: "solid",+ outlineColor: theme.colors.borderFocus,+ borderRadius: theme.borderRadius[3],+ pointerEvents: "none",+ ...style,+ },+});diff --git a/packages/design-system/src/components/section-title.tsx b/packages/design-system/src/components/section-title.tsxindex 608b9d4010..1b3b69628d 100644--- a/packages/design-system/src/components/section-title.tsx+++ b/packages/design-system/src/components/section-title.tsx@@ -17,6 +17,7 @@ import { theme, css, styled, type CSS } from "../stitches.config";import { Button } from "./button";import { ArrowFocus } from "./primitives/arrow-focus";import { Label, isLabelButton } from "./label";+import { focusRingStyle } from "./focus-ring";const buttonContentColor = "--ws-section-title-button-content-color";const labelTextColor = "--ws-section-title-label-content-color";@@ -49,16 +50,7 @@ const labelContainerStyle = css({});const titleButtonStyle = css(titleButtonLayoutStyle, {- "&:focus-visible::before": {- content: "''",- position: "absolute",- top: 0,- bottom: 0,- left: theme.spacing[2],- right: theme.spacing[2],- borderRadius: theme.borderRadius[4],- border: `2px solid ${theme.colors.borderFocus}`,- },+ "&:focus-visible": focusRingStyle(),});const suffixSlotStyle = css({diff --git a/packages/design-system/src/components/text.ts b/packages/design-system/src/components/text.tsindex b9556cab68..7d14b3ab6d 100644--- a/packages/design-system/src/components/text.ts+++ b/packages/design-system/src/components/text.ts@@ -53,9 +53,6 @@ export const textStyle = css({pb: "0.5em",mt: "-0.5em",mb: "-0.5em",-- flexBasis: 0,- flexGrow: 1,},},userSelect: {diff --git a/packages/design-system/src/components/toolbar.tsx b/packages/design-system/src/components/toolbar.tsxindex dd8a331961..377fe6f9d9 100644--- a/packages/design-system/src/components/toolbar.tsx+++ b/packages/design-system/src/components/toolbar.tsx@@ -8,6 +8,7 @@ import { css, styled, theme } from "../stitches.config";import { separatorStyle } from "./separator";import { textVariants } from "./text";import { forwardRef, type Ref } from "react";+import { focusRingStyle } from "./focus-ring";export const Toolbar = styled(ToolbarPrimitive.Root, {display: "flex",@@ -23,18 +24,10 @@ export const ToolbarToggleGroup = styled(ToolbarPrimitive.ToggleGroup, {alignItems: "center",});-// It is inside the button, so we need it as a separate element.-const toolbarItemFocusRing = {- "&::after": {- content: '""',- position: "absolute",- inset: 4,- outlineWidth: 2,- outlineStyle: "solid",- outlineColor: theme.colors.borderFocus,- borderRadius: theme.borderRadius[3],- },-};+const focusRing = focusRingStyle({+ top: theme.spacing[3],+ bottom: theme.spacing[3],+});const toggleItemStyle = css(textVariants.labelsTitleCase, {// reset styles@@ -59,14 +52,14 @@ const toggleItemStyle = css(textVariants.labelsTitleCase, {background: "transparent",transition: "200ms background",- "&:focus-visible": toolbarItemFocusRing,+ "&:focus-visible": focusRing,"&:hover, &[data-state=on], &[data-state=open], &[aria-checked=true]": {background: theme.colors.backgroundTopbarHover,},variants: {// Just for storyfocused: {- true: toolbarItemFocusRing,+ true: focusRing,},variant: {subtle: {diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsxindex dae3a366fe..7abe227de2 100644--- a/packages/design-system/src/components/tree/tree-node.tsx+++ b/packages/design-system/src/components/tree/tree-node.tsx@@ -383,6 +383,8 @@ export const TreeItemLabelBase: ForwardRefRenderFunction<truncatecss={{ml: prefix ? theme.spacing[3] : 0,+ flexBasis: 0,+ flexGrow: 1,}}{...restProps}>diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 0a48c2e95b..bb663a4a9b 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -43,6 +43,7 @@ export * from "./components/panel-tabs";export * from "./components/ai-command-bar";export * from "./components/link";export * from "./components/panel-banner";+export * from "./components/focus-ring";// Not aligneddiff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 3f28a4c4b0..502121da8c 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -4,3 +4,4 @@ export const dark = false;export const unsupportedBrowsers = false;export const aiRadixComponents = false;export const cms = false;+export const marketplace = false;diff --git a/packages/icons/icons/bag.svg b/packages/icons/icons/bag.svgnew file mode 100644index 0000000000..50062af1e3--- /dev/null+++ b/packages/icons/icons/bag.svg@@ -0,0 +1,13 @@+<svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="currentColor"+ xmlns="http://www.w3.org/2000/svg"+>+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M4.7306 4.72942V6.03547C4.7306 6.39445 5.02161 6.68547 5.3806 6.68547C5.73959 6.68547 6.0306 6.39445 6.0306 6.03547V4.72093L9.96936 4.72093V6.03547C9.96936 6.39445 10.2604 6.68547 10.6194 6.68547C10.9783 6.68547 11.2694 6.39445 11.2694 6.03547V4.72942C11.3575 4.73255 11.438 4.73682 11.5126 4.74267C11.7759 4.76332 11.9141 4.80074 12.0135 4.84794C12.2491 4.95979 12.4461 5.13921 12.5795 5.36337C12.6358 5.45795 12.6859 5.59199 12.7311 5.85228C12.7776 6.12048 12.8106 6.46819 12.8587 6.98147L13.2517 11.1725C13.3086 11.7795 13.3469 12.1943 13.3498 12.5158C13.3527 12.8304 13.3193 12.9914 13.2715 13.1028C13.1552 13.3733 12.9516 13.597 12.6931 13.738C12.5866 13.7961 12.4294 13.8442 12.1159 13.8708C11.7955 13.8979 11.3789 13.8984 10.7693 13.8984H5.23067C4.62103 13.8984 4.20446 13.8979 3.88407 13.8708C3.57056 13.8442 3.41338 13.7961 3.30689 13.738C3.0484 13.597 2.84473 13.3733 2.7285 13.1028C2.68062 12.9914 2.64731 12.8304 2.65015 12.5158C2.65306 12.1943 2.6914 11.7795 2.7483 11.1725L3.14121 6.98147C3.18933 6.46819 3.22239 6.12048 3.2689 5.85228C3.31404 5.59199 3.3642 5.45795 3.42046 5.36337C3.55382 5.13921 3.75085 4.95979 3.98648 4.84794C4.0859 4.80074 4.22404 4.76332 4.48741 4.74267C4.56198 4.73682 4.64243 4.73255 4.7306 4.72942ZM11.206 3.427C11.353 3.43075 11.4888 3.43682 11.6142 3.44665C11.9561 3.47345 12.2705 3.53093 12.571 3.67353C13.0396 3.896 13.4315 4.25286 13.6967 4.69871C13.8668 4.98451 13.9533 5.29223 14.0119 5.63016C14.0682 5.95451 14.1056 6.35321 14.1507 6.83482L14.5486 11.0793C14.6022 11.6512 14.6463 12.121 14.6498 12.504C14.6533 12.9003 14.6157 13.2673 14.4659 13.616C14.2347 14.1541 13.8296 14.5989 13.3155 14.8793C12.9823 15.061 12.6204 15.1327 12.2255 15.1662C11.8438 15.1985 11.372 15.1985 10.7976 15.1984H5.2024C4.628 15.1985 4.15616 15.1985 3.77443 15.1662C3.37959 15.1327 3.01769 15.061 2.68445 14.8793C2.17035 14.5989 1.76525 14.1541 1.53408 13.616C1.38424 13.2673 1.34662 12.9003 1.3502 12.504C1.35367 12.1209 1.39772 11.6512 1.45134 11.0793L1.84926 6.83482C1.8944 6.35321 1.93177 5.95451 1.98802 5.63015C2.04662 5.29223 2.1332 4.98451 2.30323 4.69871C2.56847 4.25286 2.96035 3.896 3.42901 3.67353C3.72943 3.53092 4.04388 3.47345 4.38581 3.44665C4.51113 3.43682 4.64699 3.43075 4.794 3.427C5.09307 1.92975 6.41477 0.801554 7.99998 0.801554C9.58519 0.801554 10.9069 1.92975 11.206 3.427ZM9.85957 3.42093C9.59104 2.65266 8.85987 2.10155 7.99998 2.10155C7.14009 2.10155 6.40891 2.65266 6.14039 3.42093L9.85957 3.42093Z"+ />+</svg>diff --git a/packages/icons/icons/extension.svg b/packages/icons/icons/extension.svgnew file mode 100644index 0000000000..2e459f3da8--- /dev/null+++ b/packages/icons/icons/extension.svg@@ -0,0 +1,20 @@+<svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+>+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M4.28361 3.59802C4.28361 3.59802 5.19366 3.60238 5.77677 3.60517C6.35989 3.60797 6.68682 3.60953 7.26994 3.61232C7.26994 3.94455 6.96064 3.58705 7.26994 3.61232C7.26994 3.84612 6.99439 3.47193 7.26994 3.61232C7.26994 4.09217 7.26994 8.20117 7.26994 8.75139C7.44172 8.75139 12.1656 8.75139 12.4233 8.75139C12.4738 12.8651 12.4233 8.29003 12.4233 8.75139V11.7377C12.4233 12.1991 12.4233 12.579 12.3981 12.8883C12.3718 13.2093 12.3156 13.503 12.1752 13.7786C11.957 14.2068 11.6088 14.555 11.1806 14.7733C10.905 14.9136 10.6112 14.9698 10.2903 14.9961C9.98097 15.0213 9.60106 15.0213 9.1397 15.0213H4.28361C3.82225 15.0213 3.44234 15.0213 3.13304 14.9961C2.81207 14.9698 2.51831 14.9136 2.24276 14.7733C1.81449 14.555 1.46629 14.2068 1.24808 13.7786C1.10768 13.503 1.05148 13.2093 1.02526 12.8883C0.999987 12.579 0.999993 12.1991 1 11.7377V6.88163C0.999993 6.42027 0.999987 6.04037 1.02526 5.73107C1.05148 5.4101 1.10768 5.11633 1.24808 4.84078C1.46629 4.41251 1.81449 4.06432 2.24276 3.8461C2.51831 3.7057 2.81207 3.6495 3.13304 3.62328C3.44234 3.59801 3.82225 3.59802 4.28361 3.59802ZM2.11656 9.86795V11.7146C2.11656 12.2048 2.117 12.5389 2.13811 12.7974C2.1587 13.0493 2.19611 13.1798 2.24294 13.2717C2.35411 13.4898 2.53149 13.6672 2.74967 13.7784C2.84158 13.8252 2.97205 13.8626 3.22397 13.8832C3.48241 13.9043 3.81651 13.9048 4.30675 13.9048H6.15337V9.86795H2.11656ZM6.15337 8.75139H2.11656V6.90477C2.11656 6.41453 2.117 6.08043 2.13811 5.82199C2.1587 5.57007 2.19611 5.4396 2.24294 5.34769C2.35411 5.12952 2.53149 4.95213 2.74967 4.84097C2.84158 4.79414 2.97205 4.75672 3.22397 4.73614C3.48241 4.71502 3.81651 4.71459 4.30675 4.71459H6.15337V8.75139ZM7.26994 9.86795V13.9048H9.11656C9.6068 13.9048 9.94091 13.9043 10.1993 13.8832C10.4513 13.8626 10.5817 13.8252 10.6736 13.7784C10.8918 13.6672 11.0692 13.4898 11.1804 13.2717C11.2272 13.1798 11.2646 13.0493 11.2852 12.7974C11.3063 12.5389 11.3067 12.2048 11.3067 11.7146V9.86795H7.26994Z"+ fill="currentColor"+ />+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M13.7572 1.22675C13.4817 1.08636 13.1879 1.03016 12.867 1.00393C12.8373 1.00151 12.807 0.999321 12.776 0.99734C12.4841 0.978665 12.1335 0.97867 11.7164 0.978676H8.73006V7.24862H14.9747L15 6.69033V4.26229C15 3.80093 15 3.42102 14.9747 3.11172C14.9485 2.79075 14.8923 2.49698 14.7519 2.22143C14.6719 2.06434 14.5743 1.91802 14.4618 1.78494C14.2675 1.55521 14.0284 1.36493 13.7572 1.22675ZM9.84662 6.13205H13.8834V4.28542C13.8834 3.79519 13.883 3.46108 13.8619 3.20265C13.8413 2.95072 13.8039 2.82025 13.7571 2.72834C13.6459 2.51017 13.4685 2.33279 13.2503 2.22162C13.1584 2.17479 13.028 2.13737 12.776 2.11679C12.5176 2.09568 12.1835 2.09524 11.6933 2.09524H9.84662V6.13205Z"+ fill="currentColor"+ />+</svg>diff --git a/packages/icons/icons/navigator.svg b/packages/icons/icons/navigator.svgnew file mode 100644index 0000000000..99c9cec739--- /dev/null+++ b/packages/icons/icons/navigator.svg@@ -0,0 +1,23 @@+<svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+>+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M4.00018 11.35C4.00018 10.991 4.29119 10.7 4.65018 10.7L14.0171 10.7C14.3761 10.7 14.6671 10.991 14.6671 11.35C14.6671 11.709 14.3761 12 14.0171 12L4.65018 12C4.29119 12 4.00018 11.709 4.00018 11.35Z"+ />+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M4.00018 7.89551C4.00018 7.53652 4.29119 7.24551 4.65018 7.24551L14.0171 7.24551C14.3761 7.24551 14.6671 7.53652 14.6671 7.89551C14.6671 8.25449 14.3761 8.54551 14.0171 8.54551L4.65018 8.54551C4.29119 8.54551 4.00018 8.25449 4.00018 7.89551Z"+ />+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M1.33359 4.44103C1.33359 4.08205 1.6246 3.79103 1.98359 3.79103L11.3505 3.79103C11.7095 3.79103 12.0005 4.08205 12.0005 4.44103C12.0005 4.80002 11.7095 5.09103 11.3505 5.09103L1.98359 5.09103C1.6246 5.09103 1.33359 4.80002 1.33359 4.44103Z"+ />+</svg>diff --git a/packages/icons/icons/plugin.svg b/packages/icons/icons/plugin.svgnew file mode 100644index 0000000000..a50149695d--- /dev/null+++ b/packages/icons/icons/plugin.svg@@ -0,0 +1,13 @@+<svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="currentColor"+ xmlns="http://www.w3.org/2000/svg"+>+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M4.68656 2.66667C4.68656 1.38721 5.72377 0.349998 7.00323 0.349998C8.28269 0.349998 9.3199 1.38721 9.3199 2.66667V3.01666H9.35891C9.80586 3.01666 10.174 3.01665 10.4751 3.0372C10.7871 3.05849 11.0745 3.10399 11.3507 3.21838C12 3.48734 12.5159 4.00323 12.7848 4.65255C12.8992 4.92873 12.9447 5.2161 12.966 5.52811C12.976 5.67465 12.9812 5.83705 12.9838 6.01666H13.3366C14.616 6.01666 15.6532 7.05387 15.6532 8.33333C15.6532 9.61279 14.616 10.65 13.3366 10.65H12.9866V11.1603C12.9866 11.6974 12.9866 12.1397 12.9572 12.4999C12.9266 12.8736 12.8612 13.2156 12.6977 13.5364C12.4437 14.035 12.0383 14.4404 11.5396 14.6945C11.2188 14.858 10.8768 14.9234 10.5031 14.9539C10.143 14.9833 9.70066 14.9833 9.1635 14.9833H8.6699C8.31091 14.9833 8.0199 14.6923 8.0199 14.3333V13.1667C8.0199 12.6972 7.63934 12.3167 7.1699 12.3167C6.70046 12.3167 6.3199 12.6972 6.3199 13.1667V14.3333C6.3199 14.6923 6.02888 14.9833 5.6699 14.9833H4.84296C4.3058 14.9833 3.86348 14.9833 3.50337 14.9539C3.12967 14.9234 2.78764 14.858 2.46682 14.6945C1.96819 14.4404 1.5628 14.035 1.30873 13.5364C1.14527 13.2156 1.07984 12.8736 1.04931 12.4999C1.01988 12.1397 1.01989 11.6974 1.0199 11.1603L1.0199 10C1.0199 9.64101 1.31091 9.35 1.6699 9.35H2.6699C3.23139 9.35 3.68656 8.89482 3.68656 8.33333C3.68656 7.77184 3.23139 7.31666 2.6699 7.31666H1.6699C1.31091 7.31666 1.0199 7.02565 1.0199 6.66666L1.0199 6.64431C1.01989 6.19736 1.01989 5.82927 1.04044 5.52811C1.06172 5.2161 1.10722 4.92873 1.22162 4.65255C1.49058 4.00323 2.00646 3.48734 2.65579 3.21838C2.93196 3.10399 3.21933 3.05849 3.53134 3.0372C3.83251 3.01665 4.2006 3.01666 4.64755 3.01666H4.68656V2.66667ZM7.00323 1.65C6.44174 1.65 5.98656 2.10518 5.98656 2.66667V3.66667C5.98656 4.02565 5.69555 4.31666 5.33656 4.31666H4.6699C4.19506 4.31666 3.87149 4.31702 3.61983 4.33419C3.37401 4.35096 3.24464 4.38158 3.15328 4.41943C2.82249 4.55644 2.55968 4.81925 2.42266 5.15004C2.38481 5.24141 2.35419 5.37078 2.33742 5.6166C2.32953 5.73221 2.32519 5.863 2.32281 6.01666H2.6699C3.94936 6.01666 4.98656 7.05387 4.98656 8.33333C4.98656 9.61279 3.94936 10.65 2.6699 10.65H2.3199V11.1333C2.3199 11.7041 2.3204 12.0931 2.34499 12.394C2.36895 12.6873 2.41252 12.8392 2.46704 12.9462C2.59647 13.2002 2.80299 13.4068 3.05701 13.5362C3.16402 13.5907 3.31593 13.6343 3.60923 13.6582C3.91013 13.6828 4.29912 13.6833 4.8699 13.6833H5.0199V13.1667C5.0199 11.9793 5.98249 11.0167 7.1699 11.0167C8.35731 11.0167 9.3199 11.9793 9.3199 13.1667V13.6833C9.79254 13.6829 10.1297 13.6801 10.3972 13.6582C10.6905 13.6343 10.8424 13.5907 10.9495 13.5362C11.2035 13.4068 11.41 13.2002 11.5394 12.9462C11.5939 12.8392 11.6375 12.6873 11.6615 12.394C11.6861 12.0931 11.6866 11.7041 11.6866 11.1333V10C11.6866 9.64101 11.9776 9.35 12.3366 9.35H13.3366C13.8981 9.35 14.3532 8.89482 14.3532 8.33333C14.3532 7.77184 13.8981 7.31666 13.3366 7.31666H12.3366C11.9776 7.31666 11.6866 7.02565 11.6866 6.66666C11.6866 6.19183 11.6862 5.86826 11.669 5.6166C11.6523 5.37078 11.6216 5.24141 11.5838 5.15004C11.4468 4.81925 11.184 4.55644 10.8532 4.41943C10.7618 4.38158 10.6324 4.35096 10.3866 4.33419C10.135 4.31702 9.8114 4.31666 9.33656 4.31666H8.6699C8.31091 4.31666 8.0199 4.02565 8.0199 3.66667V2.66667C8.0199 2.10518 7.56472 1.65 7.00323 1.65Z"+ />+</svg>diff --git a/packages/icons/src/__generated__/bag.tsx b/packages/icons/src/__generated__/bag.tsxnew file mode 100644index 0000000000..2da06d47e3--- /dev/null+++ b/packages/icons/src/__generated__/bag.tsx@@ -0,0 +1,15 @@+// Generated from icons/bag.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const BagIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M4.73 4.73v1.305a.65.65 0 0 0 1.3 0V4.721h3.94v1.314a.65.65 0 0 0 1.3 0V4.73c.088.004.168.008.243.014.263.02.401.058.5.105.236.112.433.291.566.515.057.095.107.229.152.49.047.267.08.615.128 1.128l.393 4.191c.057.607.095 1.022.098 1.344.003.314-.03.475-.079.587-.116.27-.32.494-.578.635-.106.058-.264.106-.577.133-.32.027-.737.027-1.347.027H5.231c-.61 0-1.027 0-1.347-.027-.313-.027-.47-.075-.577-.133a1.315 1.315 0 0 1-.579-.635c-.047-.112-.08-.273-.078-.587.003-.322.041-.736.098-1.344l.393-4.19c.048-.514.081-.862.128-1.13.045-.26.095-.394.151-.489.134-.224.33-.403.566-.515.1-.047.238-.085.501-.105.075-.006.155-.01.244-.014Zm6.476-1.303c.147.004.283.01.408.02.342.026.656.084.957.227.469.222.86.579 1.126 1.025.17.286.256.593.315.931.056.325.094.723.139 1.205l.398 4.244c.053.572.097 1.042.1 1.425.004.396-.033.763-.183 1.112a2.615 2.615 0 0 1-1.15 1.263c-.334.182-.696.254-1.09.287-.382.032-.854.032-1.428.032H5.202c-.574 0-1.046 0-1.428-.032-.394-.033-.756-.105-1.09-.287a2.614 2.614 0 0 1-1.15-1.263c-.15-.349-.187-.716-.184-1.112.004-.383.048-.853.101-1.425l.398-4.244c.045-.482.083-.88.139-1.205.059-.338.145-.645.315-.931A2.615 2.615 0 0 1 3.43 3.674c.3-.143.615-.2.957-.227.125-.01.261-.016.408-.02a3.27 3.27 0 0 1 6.412 0ZM9.86 3.421a1.97 1.97 0 0 0-3.72 0h3.72Z" clipRule="evenodd" /></svg>+ );+ }+);++BagIcon.displayName = "BagIcon";diff --git a/packages/icons/src/__generated__/extension.tsx b/packages/icons/src/__generated__/extension.tsxnew file mode 100644index 0000000000..beeb0ac8e4--- /dev/null+++ b/packages/icons/src/__generated__/extension.tsx@@ -0,0 +1,15 @@+// Generated from icons/extension.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const ExtensionIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fill="currentColor" fillRule="evenodd" d="m4.284 3.598 1.493.007 1.493.007c0 .333-.31-.025 0 0 0 .234-.276-.14 0 0v5.14h5.153c.05 4.113 0-.462 0 0v2.986c0 .461 0 .841-.025 1.15-.026.321-.082.615-.223.89a2.277 2.277 0 0 1-.994.995c-.276.14-.57.197-.89.223-.31.025-.69.025-1.151.025H4.284c-.462 0-.842 0-1.151-.025-.32-.026-.615-.082-.89-.223a2.277 2.277 0 0 1-.995-.994c-.14-.276-.197-.57-.223-.89C1 12.578 1 12.198 1 11.737V6.882c0-.462 0-.842.025-1.15.026-.322.083-.616.223-.891.218-.428.566-.777.995-.995.275-.14.57-.196.89-.223.31-.025.69-.025 1.15-.025Zm-2.167 6.27v1.847c0 .49 0 .824.021 1.082.02.252.058.383.105.475.111.218.288.395.507.506.092.047.222.085.474.105.258.021.593.022 1.083.022h1.846V9.868H2.117ZM6.153 8.75H2.117V6.905c0-.49 0-.825.021-1.083.02-.252.058-.382.105-.474a1.16 1.16 0 0 1 .507-.507c.092-.047.222-.084.474-.105a14.81 14.81 0 0 1 1.083-.021h1.846V8.75ZM7.27 9.868v4.037h1.847c.49 0 .824 0 1.082-.022.252-.02.383-.058.475-.105a1.16 1.16 0 0 0 .506-.506c.047-.092.085-.223.105-.475.021-.258.022-.592.022-1.082V9.868H7.27Z" clipRule="evenodd" /><path fill="currentColor" fillRule="evenodd" d="M13.757 1.227c-.275-.14-.57-.197-.89-.223a17.79 17.79 0 0 0-1.15-.025H8.73v6.27h6.245L15 6.69V4.262c0-.461 0-.841-.025-1.15-.027-.321-.083-.615-.223-.89a2.276 2.276 0 0 0-.995-.995Zm-3.91 4.905h4.036V4.285c0-.49 0-.824-.021-1.082-.02-.252-.058-.383-.105-.475a1.16 1.16 0 0 0-.507-.506c-.092-.047-.222-.085-.474-.105a14.814 14.814 0 0 0-1.083-.022H9.847v4.037Z" clipRule="evenodd" /></svg>+ );+ }+);++ExtensionIcon.displayName = "ExtensionIcon";diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex fe0aa7e508..ebb6e9636d 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -27,6 +27,7 @@ export * from "./arrow-up";export * from "./aspect-ratio";export * from "./attachment";export * from "./auto-scroll";+export * from "./bag";export * from "./blockquote";export * from "./body";export * from "./bold";@@ -85,6 +86,7 @@ export * from "./drag-handle";export * from "./dynamic-page";export * from "./email";export * from "./embed";+export * from "./extension";export * from "./external-link";export * from "./eyecon-closed";export * from "./eyecon-open";@@ -127,6 +129,7 @@ export * from "./mic";export * from "./minimize";export * from "./minus";export * from "./navigation-menu";+export * from "./navigator";export * from "./no-wrap";export * from "./offline";export * from "./order-first";@@ -136,6 +139,7 @@ export * from "./page";export * from "./paint-brush";export * from "./phone";export * from "./play";+export * from "./plugin";export * from "./plus";export * from "./popover";export * from "./radio-checked";diff --git a/packages/icons/src/__generated__/navigator.tsx b/packages/icons/src/__generated__/navigator.tsxnew file mode 100644index 0000000000..1f75664a13--- /dev/null+++ b/packages/icons/src/__generated__/navigator.tsx@@ -0,0 +1,15 @@+// Generated from icons/navigator.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const NavigatorIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M4 11.35a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H4.65a.65.65 0 0 1-.65-.65ZM4 7.896a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H4.65a.65.65 0 0 1-.65-.65ZM1.334 4.441a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H1.983a.65.65 0 0 1-.65-.65Z" clipRule="evenodd" /></svg>+ );+ }+);++NavigatorIcon.displayName = "NavigatorIcon";diff --git a/packages/icons/src/__generated__/plugin.tsx b/packages/icons/src/__generated__/plugin.tsxnew file mode 100644index 0000000000..20ffa3828c--- /dev/null+++ b/packages/icons/src/__generated__/plugin.tsx@@ -0,0 +1,15 @@+// Generated from icons/plugin.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const PluginIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M4.687 2.667a2.317 2.317 0 0 1 4.633 0v.35h.039c.447 0 .815 0 1.116.02.312.021.6.067.876.181a2.65 2.65 0 0 1 1.434 1.435c.114.276.16.563.181.875.01.147.015.31.018.489h.353a2.317 2.317 0 0 1 0 4.633h-.35v.51c0 .537 0 .98-.03 1.34-.03.374-.096.716-.26 1.036a2.65 2.65 0 0 1-1.157 1.159c-.321.163-.663.228-1.037.259-.36.03-.802.03-1.34.03H8.67a.65.65 0 0 1-.65-.65v-1.167a.85.85 0 1 0-1.7 0v1.166a.65.65 0 0 1-.65.65h-.827c-.537 0-.98 0-1.34-.03-.373-.03-.715-.095-1.036-.258a2.65 2.65 0 0 1-1.158-1.159c-.164-.32-.23-.662-.26-1.036-.03-.36-.03-.803-.03-1.34V10a.65.65 0 0 1 .65-.65h1a1.017 1.017 0 0 0 0-2.033h-1a.65.65 0 0 1-.65-.65v-.023c0-.447 0-.815.021-1.116.022-.312.067-.6.182-.875a2.65 2.65 0 0 1 1.434-1.435c.276-.114.563-.16.875-.18.302-.021.67-.021 1.117-.021h.039v-.35ZM7.003 1.65c-.561 0-1.016.455-1.016 1.017v1a.65.65 0 0 1-.65.65H4.67c-.475 0-.799 0-1.05.017-.246.017-.375.048-.467.085-.33.137-.593.4-.73.731-.038.091-.069.22-.086.467a7.71 7.71 0 0 0-.014.4h.347a2.317 2.317 0 0 1 0 4.633h-.35v.483c0 .571 0 .96.025 1.261.024.293.068.445.122.552.13.254.336.46.59.59.107.055.259.098.552.122.301.025.69.025 1.26.025h.15v-.516a2.15 2.15 0 0 1 4.3 0v.516c.474 0 .81-.003 1.078-.025.293-.024.445-.067.553-.122.254-.13.46-.336.59-.59.054-.107.098-.259.122-.552.024-.3.025-.69.025-1.26V10a.65.65 0 0 1 .65-.65h1a1.017 1.017 0 0 0 0-2.033h-1a.65.65 0 0 1-.65-.65c0-.475 0-.799-.018-1.05-.017-.246-.047-.376-.085-.467a1.35 1.35 0 0 0-.73-.73c-.092-.038-.222-.069-.467-.086a17.153 17.153 0 0 0-1.05-.017H8.67a.65.65 0 0 1-.65-.65v-1c0-.562-.455-1.017-1.017-1.017Z" clipRule="evenodd" /></svg>+ );+ }+);++PluginIcon.displayName = "PluginIcon";diff --git a/packages/icons/src/__generated__/svg/bag.ts b/packages/icons/src/__generated__/svg/bag.tsnew file mode 100644index 0000000000..ec5d735532--- /dev/null+++ b/packages/icons/src/__generated__/svg/bag.ts@@ -0,0 +1 @@+export const BagIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M4.73 4.73v1.305a.65.65 0 0 0 1.3 0V4.721h3.94v1.314a.65.65 0 0 0 1.3 0V4.73c.088.004.168.008.243.014.263.02.401.058.5.105.236.112.433.291.566.515.057.095.107.229.152.49.047.267.08.615.128 1.128l.393 4.191c.057.607.095 1.022.098 1.344.003.314-.03.475-.079.587-.116.27-.32.494-.578.635-.106.058-.264.106-.577.133-.32.027-.737.027-1.347.027H5.231c-.61 0-1.027 0-1.347-.027-.313-.027-.47-.075-.577-.133a1.315 1.315 0 0 1-.579-.635c-.047-.112-.08-.273-.078-.587.003-.322.041-.736.098-1.344l.393-4.19c.048-.514.081-.862.128-1.13.045-.26.095-.394.151-.489.134-.224.33-.403.566-.515.1-.047.238-.085.501-.105.075-.006.155-.01.244-.014Zm6.476-1.303c.147.004.283.01.408.02.342.026.656.084.957.227.469.222.86.579 1.126 1.025.17.286.256.593.315.931.056.325.094.723.139 1.205l.398 4.244c.053.572.097 1.042.1 1.425.004.396-.033.763-.183 1.112a2.615 2.615 0 0 1-1.15 1.263c-.334.182-.696.254-1.09.287-.382.032-.854.032-1.428.032H5.202c-.574 0-1.046 0-1.428-.032-.394-.033-.756-.105-1.09-.287a2.614 2.614 0 0 1-1.15-1.263c-.15-.349-.187-.716-.184-1.112.004-.383.048-.853.101-1.425l.398-4.244c.045-.482.083-.88.139-1.205.059-.338.145-.645.315-.931A2.615 2.615 0 0 1 3.43 3.674c.3-.143.615-.2.957-.227.125-.01.261-.016.408-.02a3.27 3.27 0 0 1 6.412 0ZM9.86 3.421a1.97 1.97 0 0 0-3.72 0h3.72Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/__generated__/svg/extension.ts b/packages/icons/src/__generated__/svg/extension.tsnew file mode 100644index 0000000000..e76b1e86bc--- /dev/null+++ b/packages/icons/src/__generated__/svg/extension.ts@@ -0,0 +1 @@+export const ExtensionIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-rule="evenodd" d="m4.284 3.598 1.493.007 1.493.007c0 .333-.31-.025 0 0 0 .234-.276-.14 0 0v5.14h5.153c.05 4.113 0-.462 0 0v2.986c0 .461 0 .841-.025 1.15-.026.321-.082.615-.223.89a2.277 2.277 0 0 1-.994.995c-.276.14-.57.197-.89.223-.31.025-.69.025-1.151.025H4.284c-.462 0-.842 0-1.151-.025-.32-.026-.615-.082-.89-.223a2.277 2.277 0 0 1-.995-.994c-.14-.276-.197-.57-.223-.89C1 12.578 1 12.198 1 11.737V6.882c0-.462 0-.842.025-1.15.026-.322.083-.616.223-.891.218-.428.566-.777.995-.995.275-.14.57-.196.89-.223.31-.025.69-.025 1.15-.025Zm-2.167 6.27v1.847c0 .49 0 .824.021 1.082.02.252.058.383.105.475.111.218.288.395.507.506.092.047.222.085.474.105.258.021.593.022 1.083.022h1.846V9.868H2.117ZM6.153 8.75H2.117V6.905c0-.49 0-.825.021-1.083.02-.252.058-.382.105-.474a1.16 1.16 0 0 1 .507-.507c.092-.047.222-.084.474-.105a14.81 14.81 0 0 1 1.083-.021h1.846V8.75ZM7.27 9.868v4.037h1.847c.49 0 .824 0 1.082-.022.252-.02.383-.058.475-.105a1.16 1.16 0 0 0 .506-.506c.047-.092.085-.223.105-.475.021-.258.022-.592.022-1.082V9.868H7.27Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M13.757 1.227c-.275-.14-.57-.197-.89-.223a17.79 17.79 0 0 0-1.15-.025H8.73v6.27h6.245L15 6.69V4.262c0-.461 0-.841-.025-1.15-.027-.321-.083-.615-.223-.89a2.276 2.276 0 0 0-.995-.995Zm-3.91 4.905h4.036V4.285c0-.49 0-.824-.021-1.082-.02-.252-.058-.383-.105-.475a1.16 1.16 0 0 0-.507-.506c-.092-.047-.222-.085-.474-.105a14.814 14.814 0 0 0-1.083-.022H9.847v4.037Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/__generated__/svg/index.ts b/packages/icons/src/__generated__/svg/index.tsindex a5345dcbc7..a5059043f8 100644--- a/packages/icons/src/__generated__/svg/index.ts+++ b/packages/icons/src/__generated__/svg/index.ts@@ -27,6 +27,7 @@ export { ArrowUpIcon } from "./arrow-up";export { AspectRatioIcon } from "./aspect-ratio";export { AttachmentIcon } from "./attachment";export { AutoScrollIcon } from "./auto-scroll";+export { BagIcon } from "./bag";export { BlockquoteIcon } from "./blockquote";export { BodyIcon } from "./body";export { BoldIcon } from "./bold";@@ -85,6 +86,7 @@ export { DragHandleIcon } from "./drag-handle";export { DynamicPageIcon } from "./dynamic-page";export { EmailIcon } from "./email";export { EmbedIcon } from "./embed";+export { ExtensionIcon } from "./extension";export { ExternalLinkIcon } from "./external-link";export { EyeconClosedIcon } from "./eyecon-closed";export { EyeconOpenIcon } from "./eyecon-open";@@ -127,6 +129,7 @@ export { MicIcon } from "./mic";export { MinimizeIcon } from "./minimize";export { MinusIcon } from "./minus";export { NavigationMenuIcon } from "./navigation-menu";+export { NavigatorIcon } from "./navigator";export { NoWrapIcon } from "./no-wrap";export { OfflineIcon } from "./offline";export { OrderFirstIcon } from "./order-first";@@ -136,6 +139,7 @@ export { PageIcon } from "./page";export { PaintBrushIcon } from "./paint-brush";export { PhoneIcon } from "./phone";export { PlayIcon } from "./play";+export { PluginIcon } from "./plugin";export { PlusIcon } from "./plus";export { PopoverIcon } from "./popover";export { RadioCheckedIcon } from "./radio-checked";diff --git a/packages/icons/src/__generated__/svg/navigator.ts b/packages/icons/src/__generated__/svg/navigator.tsnew file mode 100644index 0000000000..4b16832a0d--- /dev/null+++ b/packages/icons/src/__generated__/svg/navigator.ts@@ -0,0 +1 @@+export const NavigatorIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path d="M4 11.35a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H4.65a.65.65 0 0 1-.65-.65ZM4 7.896a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H4.65a.65.65 0 0 1-.65-.65ZM1.334 4.441a.65.65 0 0 1 .65-.65h9.367a.65.65 0 1 1 0 1.3H1.983a.65.65 0 0 1-.65-.65Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/__generated__/svg/plugin.ts b/packages/icons/src/__generated__/svg/plugin.tsnew file mode 100644index 0000000000..03e7365d2a--- /dev/null+++ b/packages/icons/src/__generated__/svg/plugin.ts@@ -0,0 +1 @@+export const PluginIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M4.687 2.667a2.317 2.317 0 0 1 4.633 0v.35h.039c.447 0 .815 0 1.116.02.312.021.6.067.876.181a2.65 2.65 0 0 1 1.434 1.435c.114.276.16.563.181.875.01.147.015.31.018.489h.353a2.317 2.317 0 0 1 0 4.633h-.35v.51c0 .537 0 .98-.03 1.34-.03.374-.096.716-.26 1.036a2.65 2.65 0 0 1-1.157 1.159c-.321.163-.663.228-1.037.259-.36.03-.802.03-1.34.03H8.67a.65.65 0 0 1-.65-.65v-1.167a.85.85 0 1 0-1.7 0v1.166a.65.65 0 0 1-.65.65h-.827c-.537 0-.98 0-1.34-.03-.373-.03-.715-.095-1.036-.258a2.65 2.65 0 0 1-1.158-1.159c-.164-.32-.23-.662-.26-1.036-.03-.36-.03-.803-.03-1.34V10a.65.65 0 0 1 .65-.65h1a1.017 1.017 0 0 0 0-2.033h-1a.65.65 0 0 1-.65-.65v-.023c0-.447 0-.815.021-1.116.022-.312.067-.6.182-.875a2.65 2.65 0 0 1 1.434-1.435c.276-.114.563-.16.875-.18.302-.021.67-.021 1.117-.021h.039v-.35ZM7.003 1.65c-.561 0-1.016.455-1.016 1.017v1a.65.65 0 0 1-.65.65H4.67c-.475 0-.799 0-1.05.017-.246.017-.375.048-.467.085-.33.137-.593.4-.73.731-.038.091-.069.22-.086.467a7.71 7.71 0 0 0-.014.4h.347a2.317 2.317 0 0 1 0 4.633h-.35v.483c0 .571 0 .96.025 1.261.024.293.068.445.122.552.13.254.336.46.59.59.107.055.259.098.552.122.301.025.69.025 1.26.025h.15v-.516a2.15 2.15 0 0 1 4.3 0v.516c.474 0 .81-.003 1.078-.025.293-.024.445-.067.553-.122.254-.13.46-.336.59-.59.054-.107.098-.259.122-.552.024-.3.025-.69.025-1.26V10a.65.65 0 0 1 .65-.65h1a1.017 1.017 0 0 0 0-2.033h-1a.65.65 0 0 1-.65-.65c0-.475 0-.799-.018-1.05-.017-.246-.047-.376-.085-.467a1.35 1.35 0 0 0-.73-.73c-.092-.038-.222-.069-.467-.086a17.153 17.153 0 0 0-1.05-.017H8.67a.65.65 0 0 1-.65-.65v-1c0-.562-.455-1.017-1.017-1.017Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.tsindex b6b57c8998..8d4518c099 100644--- a/packages/icons/src/index.ts+++ b/packages/icons/src/index.ts@@ -1,5 +1,4 @@export * from "./__generated__";-export * from "./list-nested";export * from "./undo";export * from "./redo";export * from "./devices";diff --git a/packages/icons/src/list-nested.tsx b/packages/icons/src/list-nested.tsxdeleted file mode 100644index c91ef4471f..0000000000--- a/packages/icons/src/list-nested.tsx+++ /dev/null@@ -1,27 +0,0 @@-import * as React from "react";-import type { IconProps } from "./types";--export const ListNestedIcon = React.forwardRef<SVGSVGElement, IconProps>(- ({ color = "currentColor", ...props }, forwardedRef) => {- return (- <svg- width="15"- height="15"- viewBox="0 0 15 15"- fill="none"- xmlns="http://www.w3.org/2000/svg"- {...props}- ref={forwardedRef}- >- <path- fill={color}- fillRule="evenodd"- clipRule="evenodd"- d="M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z"- />- </svg>- );- }-);--ListNestedIcon.displayName = "ListNestedIcon";diff --git a/packages/react-sdk/src/components/component-meta.ts b/packages/react-sdk/src/components/component-meta.tsindex e049d087bf..67d6ceaeb0 100644--- a/packages/react-sdk/src/components/component-meta.ts+++ b/packages/react-sdk/src/components/component-meta.ts@@ -25,6 +25,7 @@ export const componentCategories = ["forms","radix","hidden",+ "utilities",] as const;export const stateCategories = ["states", "component-states"] as const;diff --git a/packages/react-sdk/src/components/components-utils.ts b/packages/react-sdk/src/components/components-utils.tsindex 72b23b61c2..ea1c9d3188 100644--- a/packages/react-sdk/src/components/components-utils.ts+++ b/packages/react-sdk/src/components/components-utils.ts@@ -4,10 +4,14 @@ export type AnyComponent = React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>,"ref"- > & {- [componentAttribute]: string;- [idAttribute]: string;- } & React.RefAttributes<HTMLElement>+ > &+ WebstudioComponentSystemProps &+ React.RefAttributes<HTMLElement>>;export type Components = Map<string, AnyComponent>;++export type WebstudioComponentSystemProps = {+ [componentAttribute]: string;+ [idAttribute]: string;+};