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
feat: Collaborative instance outline (#2429)
Oleg Isonenfff7908e42c8
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsxnew file mode 100644index 0000000000..c26ad0e708--- /dev/null+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx@@ -0,0 +1,16 @@+import { useStore } from "@nanostores/react";+import { $collaborativeInstanceOutlineAndInstance } from "~/shared/nano-states";+import { Outline } from "./outline";+import { applyScale } from "./apply-scale";+import { scaleStore } from "~/builder/shared/nano-states";++// Outline of an instance that is being edited by AI or a human collaborator.+export const CollaborativeInstanceOutline = () => {+ const outline = useStore($collaborativeInstanceOutlineAndInstance);+ const scale = useStore(scaleStore);+ if (outline === undefined) {+ return null;+ }+ const rect = applyScale(outline.rect, scale);+ return <Outline rect={rect}></Outline>;+};diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.tsindex 197c99fe6a..162cadf721 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts@@ -1,3 +1,4 @@export { SelectedInstanceOutline } from "./selected-instance-outline";export { HoveredInstanceOutline } from "./hovered-instance-outline";+export { CollaborativeInstanceOutline } from "./collaborative-instance-outline";export { applyScale } from "./apply-scale";diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxindex c1e7a81798..d24fb0feb2 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx@@ -1,17 +1,51 @@import { useMemo } from "react";-import { styled, type Rect } from "@webstudio-is/design-system";+import { css, keyframes, type Rect } from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";+import { cssVars } from "@webstudio-is/css-vars";-const OutlineContainer = styled("div", {+const angleVar = cssVars.define("angle");++// Won't work in current FF/Safari, but outline will still work, just no animation.+const propertyStyle = (+ <style>{`+ @property ${angleVar} {+ syntax: '<angle>';+ initial-value: 0deg;+ inherits: false;+ }+ `}</style>+);++const angleKeyframes = keyframes({+ to: {+ [angleVar]: "360deg",+ },+});++const baseStyle = css({position: "absolute",pointerEvents: "none",outline: `1px solid ${theme.colors.blue9}`,outlineOffset: -1,top: 0,left: 0,+ variants: {+ variant: {+ collaboration: {+ outline: "none",+ [angleVar]: `0deg`,+ border: `1px solid`,+ // @todo check with design on specific colors+ borderImage: `conic-gradient(from ${cssVars.use(+ angleVar+ )}, #FFAE3C 0%, #39FBBB 25%, #4A4EFA 50%, #E63CFE 100%) 1`,+ animation: `2s ${angleKeyframes} linear infinite`,+ },+ },+ },});-const useStyle = (rect?: Rect) => {+const useDynamicStyle = (rect?: Rect) => {return useMemo(() => {if (rect === undefined) {return;@@ -25,11 +59,19 @@ const useStyle = (rect?: Rect) => {};type OutlineProps = {- children: JSX.Element;+ children?: JSX.Element;rect?: Rect;+ variant?: "collaboration";};-export const Outline = ({ children, rect }: OutlineProps) => {- const style = useStyle(rect);- return <OutlineContainer style={style}>{children}</OutlineContainer>;+export const Outline = ({ children, rect, variant }: OutlineProps) => {+ const dynamicStyle = useDynamicStyle(rect);+ return (+ <>+ {propertyStyle}+ <div className={baseStyle({ variant })} style={dynamicStyle}>+ {children}+ </div>+ </>+ );};diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.tsindex 86281ee66b..6652574c85 100644--- a/apps/builder/app/shared/nano-states/canvas.ts+++ b/apps/builder/app/shared/nano-states/canvas.ts@@ -55,6 +55,11 @@ export const hoveredInstanceOutlineAndInstanceStore = computed(getInstanceOutlineAndInstance);+// @todo implement like above+export const $collaborativeInstanceOutlineAndInstance = atom<+ undefined | { instance: Instance; rect: DOMRect }+>(undefined);+export const synchronizedCanvasStores = [["textToolbar", textToolbarStore],["selectedInstanceOutline", selectedInstanceOutlineStore],