@puckeditor/plugin-emotion-cache 0.23.0-canary.fb9392de → 0.24.0-canary.34794e5d

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ReactElement, CSSProperties, ReactNode, ElementType, Ref, JSX } from 'react';
+import { ElementType, CSSProperties, Ref, ComponentPropsWithoutRef, ReactElement, ReactNode, JSX } from 'react';
 import { EditorStateSnapshot, Editor, Extensions } from '@tiptap/react';
 import { BlockquoteOptions } from '@tiptap/extension-blockquote';
 import { BoldOptions } from '@tiptap/extension-bold';
@@ -20,6 +20,62 @@ type ItemSelector = {
     zone?: string;
 };
 
+/**
+ * Props consumed by Puck internally that are shared between DropZones and slots.
+ */
+type DropZoneSharedProps<ComponentType extends ElementType = "div"> = {
+    allow?: string[];
+    disallow?: string[];
+    style?: CSSProperties;
+    minEmptyHeight?: CSSProperties["minHeight"] | number;
+    className?: string;
+    collisionAxis?: DragAxis;
+    ref?: Ref<any>;
+    as?: ComponentType;
+};
+/**
+ * All props consumed by Puck for a DropZone component. `zone` lives here only.
+ *
+ * On slots `zone` is injected internally, so slots use {@link SlotProps} instead.
+ */
+type DropZoneOwnProps<ComponentType extends ElementType = "div"> = DropZoneSharedProps<ComponentType> & {
+    zone: string;
+};
+/**
+ * Unsupported additional props that are never forwarded to `as`.
+ *
+ * Omitted from the public types AND stripped at runtime.
+ */
+type NonForwardableProps = {
+    children?: unknown;
+    dangerouslySetInnerHTML?: unknown;
+};
+/**
+ * Keys internally consumed by Puck and never forwarded to `as`.
+ */
+type ConsumedPropKey = keyof DropZoneOwnProps | "as" | "content" | "config" | "metadata";
+/**
+ * Additional props forwarded to the element or component provided via `as`,
+ * typed against it.
+ *
+ * Puck-internal/unsupported props are stripped so they don't leak onto the DOM.
+ */
+type ForwardedProps<ComponentType extends ElementType> = Omit<ComponentPropsWithoutRef<ComponentType>, ConsumedPropKey | keyof NonForwardableProps>;
+/**
+ * Props for a `DropZone` component.
+ *
+ * Any additional props not consumed by Puck are forwarded to the element or
+ * component provided via `as` (defaulting to a `div`), typed against it.
+ */
+type DropZoneProps<ComponentType extends ElementType = "div"> = DropZoneOwnProps<ComponentType> & ForwardedProps<ComponentType>;
+/**
+ * Props for a `slot` render component.
+ *
+ * Any additional props not consumed by Puck are forwarded to the element or
+ * component provided via `as` (defaulting to a `div`), typed against it.
+ */
+type SlotProps<ComponentType extends ElementType = "div"> = DropZoneSharedProps<ComponentType> & ForwardedProps<ComponentType>;
+
 declare const defaultEditorState: (ctx: EditorStateSnapshot, readOnly: boolean) => {
     isAlignLeft?: undefined;
     canAlignLeft?: undefined;
@@ -338,20 +394,11 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
-type DropZoneProps = {
-    zone: string;
-    allow?: string[];
-    disallow?: string[];
-    style?: CSSProperties;
-    minEmptyHeight?: CSSProperties["minHeight"] | number;
-    className?: string;
-    collisionAxis?: DragAxis;
-    as?: ElementType;
-    ref?: Ref<any>;
-};
-
 type PuckContext = {
-    renderDropZone: (props: DropZoneProps) => React.ReactNode;
+    /**
+     * @deprecated Use {@link https://puckeditor.com/docs/api-reference/fields/slot Slots} instead.
+     */
+    renderDropZone: <ComponentType extends ElementType = "div">(props: DropZoneProps<ComponentType>) => React.ReactNode;
     metadata: Metadata;
     isEditing: boolean;
     dragRef: ((element: Element | null) => void) | null;
@@ -359,6 +406,12 @@ type PuckContext = {
 type DefaultRootFieldProps = {
     title?: string;
 };
+/**
+ * Merge the default root field props into user-provided root props, letting
+ * the user's props take precedence. Using a plain intersection would turn an
+ * overridden `title` (e.g. `number`) into `never` (`number & string`).
+ */
+type WithDefaultRootFieldProps<RootProps> = RootProps & Omit<DefaultRootFieldProps, keyof RootProps>;
 type DefaultComponentProps = {
     [key: string]: any;
 };
@@ -378,7 +431,7 @@ type UserGenerics<UserConfig extends Config = Config, UserParams extends Extract
     UserConfig: UserConfig;
     UserParams: UserParams;
     UserProps: UserParams["props"];
-    UserRootProps: UserParams["rootProps"] & DefaultRootFieldProps;
+    UserRootProps: WithDefaultRootFieldProps<UserParams["rootProps"]>;
     UserData: UserData;
     UserAppState: UserAppState;
     UserPublicAppState: UserPublicAppState;
@@ -391,7 +444,7 @@ type ExtractField<UserField extends {
     type: T;
 }>;
 
-type SlotComponent = (props?: Omit<DropZoneProps, "zone">) => ReactNode;
+type SlotComponent = <ComponentType extends ElementType = "div">(props?: SlotProps<ComponentType>) => ReactNode;
 type PuckComponent<Props> = (props: WithId<WithPuckProps<{
     [K in keyof Props]: WithDeepSlots<Props[K], SlotComponent>;
 }>>) => JSX.Element;
@@ -462,7 +515,7 @@ type DefaultComponents = Record<string, any>;
 type Config<PropsOrParams extends LeftOrExactRight<PropsOrParams, DefaultComponents, ConfigParams> = DefaultComponents | ConfigParams, RootProps extends DefaultComponentProps = any, CategoryName extends string = string> = PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, never> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number]> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, infer ParamFields> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], ParamFields[keyof ParamFields] & BaseField> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, any> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], {}> : ConfigInternal<PropsOrParams, RootProps, CategoryName>;
 type ExtractConfigParams<UserConfig extends ConfigInternal> = UserConfig extends ConfigInternal<infer PropsOrParams, infer RootProps, infer CategoryName, infer UserField> ? {
     props: PropsOrParams;
-    rootProps: RootProps & DefaultRootFieldProps;
+    rootProps: WithDefaultRootFieldProps<RootProps>;
     categoryNames: CategoryName;
     field: UserField extends {
         type: string;
@@ -545,6 +598,8 @@ type UiState = {
         expanded?: boolean;
     }>;
     isDragging: boolean;
+    /** Outline items whose children are shown, keyed by item id */
+    itemExpanded?: Record<string, boolean>;
     viewports: {
         current: {
             width: number | "100%";
@@ -690,12 +745,12 @@ type Overrides<UserConfig extends Config = Config> = OverridesGeneric<{
 }>;
 type FieldRenderFunctions<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>, UserField extends {
     type: string;
-} = Field | G["UserField"]> = Omit<{
+} = Field | G["UserField"]> = {
     [Type in UserField["type"]]: React.FunctionComponent<FieldProps<ExtractField<UserField, Type>, any> & {
         children: ReactNode;
         name: string;
-    }>;
-}, "custom">;
+    }> | null;
+};
 
 type DragAxis = "dynamic" | "y" | "x";
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement, CSSProperties, ReactNode, ElementType, Ref, JSX } from 'react';
+import { ElementType, CSSProperties, Ref, ComponentPropsWithoutRef, ReactElement, ReactNode, JSX } from 'react';
 import { EditorStateSnapshot, Editor, Extensions } from '@tiptap/react';
 import { BlockquoteOptions } from '@tiptap/extension-blockquote';
 import { BoldOptions } from '@tiptap/extension-bold';
@@ -20,6 +20,62 @@ type ItemSelector = {
     zone?: string;
 };
 
+/**
+ * Props consumed by Puck internally that are shared between DropZones and slots.
+ */
+type DropZoneSharedProps<ComponentType extends ElementType = "div"> = {
+    allow?: string[];
+    disallow?: string[];
+    style?: CSSProperties;
+    minEmptyHeight?: CSSProperties["minHeight"] | number;
+    className?: string;
+    collisionAxis?: DragAxis;
+    ref?: Ref<any>;
+    as?: ComponentType;
+};
+/**
+ * All props consumed by Puck for a DropZone component. `zone` lives here only.
+ *
+ * On slots `zone` is injected internally, so slots use {@link SlotProps} instead.
+ */
+type DropZoneOwnProps<ComponentType extends ElementType = "div"> = DropZoneSharedProps<ComponentType> & {
+    zone: string;
+};
+/**
+ * Unsupported additional props that are never forwarded to `as`.
+ *
+ * Omitted from the public types AND stripped at runtime.
+ */
+type NonForwardableProps = {
+    children?: unknown;
+    dangerouslySetInnerHTML?: unknown;
+};
+/**
+ * Keys internally consumed by Puck and never forwarded to `as`.
+ */
+type ConsumedPropKey = keyof DropZoneOwnProps | "as" | "content" | "config" | "metadata";
+/**
+ * Additional props forwarded to the element or component provided via `as`,
+ * typed against it.
+ *
+ * Puck-internal/unsupported props are stripped so they don't leak onto the DOM.
+ */
+type ForwardedProps<ComponentType extends ElementType> = Omit<ComponentPropsWithoutRef<ComponentType>, ConsumedPropKey | keyof NonForwardableProps>;
+/**
+ * Props for a `DropZone` component.
+ *
+ * Any additional props not consumed by Puck are forwarded to the element or
+ * component provided via `as` (defaulting to a `div`), typed against it.
+ */
+type DropZoneProps<ComponentType extends ElementType = "div"> = DropZoneOwnProps<ComponentType> & ForwardedProps<ComponentType>;
+/**
+ * Props for a `slot` render component.
+ *
+ * Any additional props not consumed by Puck are forwarded to the element or
+ * component provided via `as` (defaulting to a `div`), typed against it.
+ */
+type SlotProps<ComponentType extends ElementType = "div"> = DropZoneSharedProps<ComponentType> & ForwardedProps<ComponentType>;
+
 declare const defaultEditorState: (ctx: EditorStateSnapshot, readOnly: boolean) => {
     isAlignLeft?: undefined;
     canAlignLeft?: undefined;
@@ -338,20 +394,11 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
-type DropZoneProps = {
-    zone: string;
-    allow?: string[];
-    disallow?: string[];
-    style?: CSSProperties;
-    minEmptyHeight?: CSSProperties["minHeight"] | number;
-    className?: string;
-    collisionAxis?: DragAxis;
-    as?: ElementType;
-    ref?: Ref<any>;
-};
-
 type PuckContext = {
-    renderDropZone: (props: DropZoneProps) => React.ReactNode;
+    /**
+     * @deprecated Use {@link https://puckeditor.com/docs/api-reference/fields/slot Slots} instead.
+     */
+    renderDropZone: <ComponentType extends ElementType = "div">(props: DropZoneProps<ComponentType>) => React.ReactNode;
     metadata: Metadata;
     isEditing: boolean;
     dragRef: ((element: Element | null) => void) | null;
@@ -359,6 +406,12 @@ type PuckContext = {
 type DefaultRootFieldProps = {
     title?: string;
 };
+/**
+ * Merge the default root field props into user-provided root props, letting
+ * the user's props take precedence. Using a plain intersection would turn an
+ * overridden `title` (e.g. `number`) into `never` (`number & string`).
+ */
+type WithDefaultRootFieldProps<RootProps> = RootProps & Omit<DefaultRootFieldProps, keyof RootProps>;
 type DefaultComponentProps = {
     [key: string]: any;
 };
@@ -378,7 +431,7 @@ type UserGenerics<UserConfig extends Config = Config, UserParams extends Extract
     UserConfig: UserConfig;
     UserParams: UserParams;
     UserProps: UserParams["props"];
-    UserRootProps: UserParams["rootProps"] & DefaultRootFieldProps;
+    UserRootProps: WithDefaultRootFieldProps<UserParams["rootProps"]>;
     UserData: UserData;
     UserAppState: UserAppState;
     UserPublicAppState: UserPublicAppState;
@@ -391,7 +444,7 @@ type ExtractField<UserField extends {
     type: T;
 }>;
 
-type SlotComponent = (props?: Omit<DropZoneProps, "zone">) => ReactNode;
+type SlotComponent = <ComponentType extends ElementType = "div">(props?: SlotProps<ComponentType>) => ReactNode;
 type PuckComponent<Props> = (props: WithId<WithPuckProps<{
     [K in keyof Props]: WithDeepSlots<Props[K], SlotComponent>;
 }>>) => JSX.Element;
@@ -462,7 +515,7 @@ type DefaultComponents = Record<string, any>;
 type Config<PropsOrParams extends LeftOrExactRight<PropsOrParams, DefaultComponents, ConfigParams> = DefaultComponents | ConfigParams, RootProps extends DefaultComponentProps = any, CategoryName extends string = string> = PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, never> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number]> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, infer ParamFields> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], ParamFields[keyof ParamFields] & BaseField> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, any> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], {}> : ConfigInternal<PropsOrParams, RootProps, CategoryName>;
 type ExtractConfigParams<UserConfig extends ConfigInternal> = UserConfig extends ConfigInternal<infer PropsOrParams, infer RootProps, infer CategoryName, infer UserField> ? {
     props: PropsOrParams;
-    rootProps: RootProps & DefaultRootFieldProps;
+    rootProps: WithDefaultRootFieldProps<RootProps>;
     categoryNames: CategoryName;
     field: UserField extends {
         type: string;
@@ -545,6 +598,8 @@ type UiState = {
         expanded?: boolean;
     }>;
     isDragging: boolean;
+    /** Outline items whose children are shown, keyed by item id */
+    itemExpanded?: Record<string, boolean>;
     viewports: {
         current: {
             width: number | "100%";
@@ -690,12 +745,12 @@ type Overrides<UserConfig extends Config = Config> = OverridesGeneric<{
 }>;
 type FieldRenderFunctions<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>, UserField extends {
     type: string;
-} = Field | G["UserField"]> = Omit<{
+} = Field | G["UserField"]> = {
     [Type in UserField["type"]]: React.FunctionComponent<FieldProps<ExtractField<UserField, Type>, any> & {
         children: ReactNode;
         name: string;
-    }>;
-}, "custom">;
+    }> | null;
+};
 
 type DragAxis = "dynamic" | "y" | "x";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@puckeditor/plugin-emotion-cache",
-  "version": "0.23.0-canary.fb9392de",
+  "version": "0.24.0-canary.34794e5d",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "puckeditor/puck",
   "bugs": "https://github.com/puckeditor/puck/issues",
@@ -24,7 +24,7 @@
   ],
   "devDependencies": {
     "@emotion/react": "^11.13.3",
-    "@puckeditor/core": "^0.23.0-canary.fb9392de",
+    "@puckeditor/core": "^0.24.0-canary.34794e5d",
     "@types/minimatch": "3.0.5",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.0.2",