@crystallize/design-system 1.17.6 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @crystallize/design-system
 
+## 1.18.0
+
+### Minor Changes
+
+- 7d5e071: Add z-index 100 to the dropdown menu content so it goes the same as dialog. There is an issue where opening a dropdown in modal would show the dropdown behind and thus be not visible.
+
 ## 1.17.6
 
 ### Patch Changes

package/dist/index.css

@@ -1180,7 +1180,6 @@ button {
 }
 .c-action-menu-item {
   display: flex;
-  cursor: pointer;
   align-items: center;
   gap: 0.5rem;
   padding-left: 1.25rem;
@@ -1208,20 +1207,6 @@ button {
   font-weight: 500;
   color: rgb(var(--c-color-gray));
 }
-.c-action-menu-item:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(var(--c-color-gray-50-900) / var(--tw-bg-opacity));
-}
-.c-action-menu-item:focus {
-  --tw-bg-opacity: 1;
-  background-color: rgb(var(--c-color-gray-50-900) / var(--tw-bg-opacity));
-  outline: 2px solid transparent;
-  outline-offset: 2px;
-}
-.c-action-menu-item.danger {
-  --tw-text-opacity: 1;
-  color: rgb(var(--c-color-pink-600-300) / var(--tw-text-opacity));
-}
 .c-action-menu-item-separator {
   margin: 0px;
   height: 1px;
@@ -1240,6 +1225,7 @@ button {
 .c-dropdown-menu-content {
   animation-duration: 0.4s;
   animation-timing-function: cubic-bezier(0.16, 1, 0.3, 1);
+  z-index: 100;
   --tw-shadow: 0 2px 4px rgba(130,138,144,0.15);
   --tw-shadow-colored: 0 2px 4px var(--tw-shadow-color);
   box-shadow:
@@ -1288,7 +1274,6 @@ button {
 .c-dropdown-menu-item {
   display: flex;
   height: 2.5rem;
-  cursor: pointer;
   align-items: center;
   --tw-bg-opacity: 1;
   background-color: rgb(var(--c-color-elevate) / var(--tw-bg-opacity));
@@ -1313,20 +1298,35 @@ button {
   font-size: 0.75rem;
   line-height: 1rem;
   font-weight: 500;
+}
+.c-dropdown-menu-item:first-child {
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+}
+.c-dropdown-menu-item:last-child {
+  border-bottom-left-radius: 0.25rem;
+  border-bottom-right-radius: 0.25rem;
+}
+.c-dropdown-menu-item:not([data-disabled]) {
+  cursor: pointer;
   --tw-text-opacity: 1;
   color: rgb(var(--c-color-gray-700-200) / var(--tw-text-opacity));
 }
-.c-dropdown-menu-item:hover,
-.c-dropdown-menu-item:focus,
-.c-dropdown-menu-item:focus-visible,
-.c-dropdown-menu-item:hover.selected,
-.c-dropdown-menu-item:focus.selected,
-.c-dropdown-menu-item:focus-visible.selected {
+.c-dropdown-menu-item:not([data-disabled]):hover,
+.c-dropdown-menu-item:not([data-disabled]):focus,
+.c-dropdown-menu-item:not([data-disabled]):focus-visible,
+.c-dropdown-menu-item:not([data-disabled]):hover.selected,
+.c-dropdown-menu-item:not([data-disabled]):focus.selected,
+.c-dropdown-menu-item:not([data-disabled]):focus-visible.selected {
   --tw-bg-opacity: 1;
   background-color: rgb(var(--c-color-gray-50-900) / var(--tw-bg-opacity));
   outline: 2px solid transparent;
   outline-offset: 2px;
 }
+.c-dropdown-menu-item[data-disabled] {
+  cursor: not-allowed;
+  color: rgb(var(--c-color-gray-700-200) / 0.5);
+}
 .c-dropdown-menu-item.selected {
   --tw-bg-opacity: 1;
   background-color: rgb(var(--c-color-gray-50-900) / var(--tw-bg-opacity));
@@ -1334,13 +1334,12 @@ button {
   --tw-text-opacity: 1;
   color: rgb(var(--c-color-green-500-400) / var(--tw-text-opacity));
 }
-.c-dropdown-menu-item:first-child {
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
+.c-dropdown-menu-item.danger {
+  --tw-text-opacity: 1;
+  color: rgb(var(--c-color-pink-600-300) / var(--tw-text-opacity));
 }
-.c-dropdown-menu-item:last-child {
-  border-bottom-left-radius: 0.25rem;
-  border-bottom-right-radius: 0.25rem;
+.c-dropdown-menu-item.danger[data-disabled] {
+  color: rgb(var(--c-color-pink-600-300) / 0.5);
 }
 @keyframes slideUp {
   from {
@@ -1562,9 +1561,6 @@ button {
   font-weight: 500;
 }
 .c-icon-button:disabled {
-  --tw-scale-x: 1;
-  --tw-scale-y: 1;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
   cursor: default;
   --tw-shadow: 0 0 #0000;
   --tw-shadow-colored: 0 0 #0000;
@@ -2666,10 +2662,6 @@ button {
   border-bottom-left-radius: 0.375rem;
   border-bottom-right-radius: 0.375rem;
 }
-.c-rich-text-editor .c-rte-editor-container:not(.disabled) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
-}
 .c-rich-text-editor .c-rte-editor {
   position: relative;
 }
@@ -3653,7 +3645,6 @@ button {
   position: relative;
   height: 1.5rem;
   width: 2.75rem;
-  cursor: pointer;
   border-radius: 9999px;
   border-width: 1px;
   border-style: solid;
@@ -3674,6 +3665,9 @@ button {
   outline: 2px solid transparent;
   outline-offset: 2px;
 }
+.c-switch-root:enabled {
+  cursor: pointer;
+}
 .c-switch-root:disabled {
   opacity: 0.4;
 }

package/dist/index.d.ts

@@ -20,7 +20,7 @@ declare function Separator({ className }: SeparatorProps): JSX.Element;
 type ItemProps = DropdownMenuItemProps$1 & {
     onSelect?: (event: React.MouseEvent<HTMLDivElement>) => void;
 };
-declare function Item({ children, className, onSelect, ...delegated }: ItemProps): JSX.Element;
+declare function Item({ children, className, ...delegated }: ItemProps): JSX.Element;
 
 type DropdownMenuItemProps = DropdownMenuPrimitive.MenuItemProps & {
     children: React.ReactNode;
@@ -412,6 +412,7 @@ type CrystallizeRichTextActionMenuItem = {
     title: string;
     action: () => void;
     type?: 'default' | 'danger';
+    disabled?: boolean;
 };
 
 type TRichTextBase = {

package/dist/index.js

@@ -29167,10 +29167,9 @@ var DropdownMenu = {
 // src/action-menu/action-item.tsx
 var import_class_variance_authority5 = require("class-variance-authority");
 var import_jsx_runtime7 = require("react/jsx-runtime");
-function Item2({ children, className, onSelect, ...delegated }) {
+function Item2({ children, className, ...delegated }) {
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(DropdownMenu.Item, {
     ...delegated,
-    onClick: onSelect,
     className: (0, import_class_variance_authority5.cx)(className, ["c-action-menu-item"]),
     children
   });
@@ -37090,10 +37089,7 @@ async function copyJson(editor) {
     console.warn("Copy failed", error);
   }
 }
-function ActionsPlugin({
-  append,
-  prepend
-}) {
+function ActionsPlugin({ append, prepend, disabled }) {
   const [editor] = (0, import_LexicalComposerContext10.useLexicalComposerContext)();
   const tr = useTr();
   return /* @__PURE__ */ (0, import_jsx_runtime134.jsxs)(ActionMenu, {
@@ -37101,6 +37097,7 @@ function ActionsPlugin({
       !prepend ? null : prepend.map((actionItem) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(ActionMenu.Item, {
         onSelect: actionItem.action,
         className: actionItem.type === "danger" ? "danger" : "",
+        disabled: actionItem.disabled,
         children: actionItem.title
       }, actionItem.title)),
       /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(ActionMenu.Item, {
@@ -37108,6 +37105,7 @@ function ActionsPlugin({
         children: tr("actionCopyJSON")
       }),
       /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(ActionMenu.Item, {
+        disabled,
         className: "danger",
         onSelect: () => {
           editor.dispatchCommand(import_lexical14.CLEAR_EDITOR_COMMAND, void 0);
@@ -37118,6 +37116,7 @@ function ActionsPlugin({
       !append ? null : append.map((actionItem) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(ActionMenu.Item, {
         onSelect: actionItem.action,
         className: actionItem.type === "danger" ? "danger" : "",
+        disabled: actionItem.disabled,
         children: actionItem.title
       }, actionItem.title))
     ]
@@ -37393,7 +37392,8 @@ function Divider() {
 }
 function ToolbarPlugin({
   actionsMenuPrepend,
-  actionsMenuAppend
+  actionsMenuAppend,
+  disabled
 }) {
   const [editor] = (0, import_LexicalComposerContext11.useLexicalComposerContext)();
   const [activeEditor, setActiveEditor] = (0, import_react121.useState)(editor);
@@ -37818,6 +37818,7 @@ function ToolbarPlugin({
         ]
       }),
       /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(ActionsPlugin, {
+        disabled,
         prepend: actionsMenuPrepend,
         append: actionsMenuAppend
       })
@@ -38004,6 +38005,7 @@ function RichTextEditorWithoutContext({
         ignoreSelectionChange: true
       }),
       /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(ToolbarPlugin, {
+        disabled,
         actionsMenuPrepend,
         actionsMenuAppend
       }),

package/dist/index.mjs

@@ -279,10 +279,9 @@ var DropdownMenu = {
 // src/action-menu/action-item.tsx
 import { cx as cx3 } from "class-variance-authority";
 import { jsx as jsx7 } from "react/jsx-runtime";
-function Item2({ children, className, onSelect, ...delegated }) {
+function Item2({ children, className, ...delegated }) {
   return /* @__PURE__ */ jsx7(DropdownMenu.Item, {
     ...delegated,
-    onClick: onSelect,
     className: cx3(className, ["c-action-menu-item"]),
     children
   });
@@ -8284,10 +8283,7 @@ async function copyJson(editor) {
     console.warn("Copy failed", error);
   }
 }
-function ActionsPlugin({
-  append,
-  prepend
-}) {
+function ActionsPlugin({ append, prepend, disabled }) {
   const [editor] = useLexicalComposerContext10();
   const tr = useTr();
   return /* @__PURE__ */ jsxs110(ActionMenu, {
@@ -8295,6 +8291,7 @@ function ActionsPlugin({
       !prepend ? null : prepend.map((actionItem) => /* @__PURE__ */ jsx134(ActionMenu.Item, {
         onSelect: actionItem.action,
         className: actionItem.type === "danger" ? "danger" : "",
+        disabled: actionItem.disabled,
         children: actionItem.title
       }, actionItem.title)),
       /* @__PURE__ */ jsx134(ActionMenu.Item, {
@@ -8302,6 +8299,7 @@ function ActionsPlugin({
         children: tr("actionCopyJSON")
       }),
       /* @__PURE__ */ jsx134(ActionMenu.Item, {
+        disabled,
         className: "danger",
         onSelect: () => {
           editor.dispatchCommand(CLEAR_EDITOR_COMMAND, void 0);
@@ -8312,6 +8310,7 @@ function ActionsPlugin({
       !append ? null : append.map((actionItem) => /* @__PURE__ */ jsx134(ActionMenu.Item, {
         onSelect: actionItem.action,
         className: actionItem.type === "danger" ? "danger" : "",
+        disabled: actionItem.disabled,
         children: actionItem.title
       }, actionItem.title))
     ]
@@ -8587,7 +8586,8 @@ function Divider() {
 }
 function ToolbarPlugin({
   actionsMenuPrepend,
-  actionsMenuAppend
+  actionsMenuAppend,
+  disabled
 }) {
   const [editor] = useLexicalComposerContext11();
   const [activeEditor, setActiveEditor] = useState9(editor);
@@ -9012,6 +9012,7 @@ function ToolbarPlugin({
         ]
       }),
       /* @__PURE__ */ jsx136(ActionsPlugin, {
+        disabled,
         prepend: actionsMenuPrepend,
         append: actionsMenuAppend
       })
@@ -9198,6 +9199,7 @@ function RichTextEditorWithoutContext({
         ignoreSelectionChange: true
       }),
       /* @__PURE__ */ jsx137(ToolbarPlugin, {
+        disabled,
         actionsMenuPrepend,
         actionsMenuAppend
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystallize/design-system",
-  "version": "1.17.6",
+  "version": "1.18.0",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/action-menu/action-item.tsx

@@ -7,9 +7,9 @@ type ItemProps = DropdownMenuItemProps & {
   onSelect?: (event: React.MouseEvent<HTMLDivElement>) => void;
 };
 
-export function Item({ children, className, onSelect, ...delegated }: ItemProps) {
+export function Item({ children, className, ...delegated }: ItemProps) {
   return (
-    <DropdownMenu.Item {...delegated} onClick={onSelect} className={cx(className, ['c-action-menu-item'])}>
+    <DropdownMenu.Item {...delegated} className={cx(className, ['c-action-menu-item'])}>
       {children}
     </DropdownMenu.Item>
   );

package/src/action-menu/action-menu.css

@@ -45,19 +45,7 @@
 }
 
 .c-action-menu-item {
-  @apply flex cursor-pointer items-center gap-2 px-5 py-2.5 font-sans text-sm font-medium text-gray;
-
-  &:hover {
-    @apply bg-gray-50-900;
-  }
-
-  &:focus {
-    @apply bg-gray-50-900 outline-none;
-  }
-
-  &.danger {
-    @apply text-pink-600-300;
-  }
+  @apply flex items-center gap-2 px-5 py-2.5 font-sans text-sm font-medium text-gray;
 }
 
 .c-action-menu-item-separator {

package/src/action-menu/action-menu.test.tsx

@@ -19,7 +19,7 @@ describe('ActionMenu', () => {
     const callbackThatShouldNotBeExecuted = vi.fn();
     const user = userEvent.setup();
 
-    const touchableProps = { onSelect: onSelectOption, onClick: onSelectOption };
+    const touchableProps = { onSelect: onSelectOption };
     const touchablePropsThatShouldNotBeCalled = {
       onSelect: callbackThatShouldNotBeExecuted,
       onClick: callbackThatShouldNotBeExecuted,
@@ -36,7 +36,7 @@ describe('ActionMenu', () => {
     await user.click(triggerButton);
 
     // The user should be able to see the dropdown menu
-    const dropdownMenu = await screen.getByRole('menu');
+    const dropdownMenu = screen.getByRole('menu');
     expect(dropdownMenu).toBeInTheDocument();
 
     // The user should be able to see the list of options

package/src/dropdown-menu/dropdown-menu.css

@@ -1,7 +1,7 @@
 .c-dropdown-menu-content {
   animation-duration: 0.4s;
   animation-timing-function: cubic-bezier(0.16, 1, 0.3, 1);
-  @apply shadow;
+  @apply z-[100] shadow;
 }
 
 .c-dropdown-menu-content[data-side='top'] {
@@ -17,22 +17,37 @@
 }
 
 .c-dropdown-menu-item {
-  @apply flex h-10 cursor-pointer items-center bg-elevate px-4 font-sans text-xs font-medium text-gray-700-200;
+  @apply flex h-10 items-center bg-elevate px-4 font-sans text-xs font-medium;
+  @apply first:rounded-tl first:rounded-tr last:rounded-bl last:rounded-br;
+
+  &:not([data-disabled]) {
+    @apply cursor-pointer text-gray-700-200;
+
+    &:hover,
+    &:focus,
+    &:focus-visible,
+    &:hover.selected,
+    &:focus.selected,
+    &:focus-visible.selected {
+      @apply bg-gray-50-900 outline-none;
+    }
+  }
 
-  &:hover,
-  &:focus,
-  &:focus-visible,
-  &:hover.selected,
-  &:focus.selected,
-  &:focus-visible.selected {
-    @apply bg-gray-50-900 outline-none;
+  &[data-disabled] {
+    @apply cursor-not-allowed text-gray-700-200/50;
   }
 
   &.selected {
     @apply bg-gray-50-900 font-bold text-green-500-400;
   }
 
-  @apply first:rounded-tl first:rounded-tr last:rounded-bl last:rounded-br;
+  &.danger {
+    @apply text-pink-600-300;
+
+    &[data-disabled] {
+      @apply text-pink-600-300/50;
+    }
+  }
 }
 
 @keyframes slideUp {

package/src/icon-button/icon-button.css

@@ -2,7 +2,7 @@
   @apply flex cursor-pointer appearance-none items-center justify-center rounded border-none bg-transparent p-0 font-medium;
 
   &:disabled {
-    @apply scale-100 cursor-default shadow-none;
+    @apply cursor-default shadow-none;
   }
 
   &:enabled {

package/src/rich-text-editor/plugins/ActionsPlugin/index.tsx

@@ -25,13 +25,13 @@ async function copyJson(editor: LexicalEditor) {
   }
 }
 
-export default function ActionsPlugin({
-  append,
-  prepend,
-}: {
+type ActionsPluginProps = {
   append?: CrystallizeRichTextActionMenuItem[];
   prepend?: CrystallizeRichTextActionMenuItem[];
-}): JSX.Element {
+  disabled?: boolean;
+};
+
+export default function ActionsPlugin({ append, prepend, disabled }: ActionsPluginProps): JSX.Element {
   const [editor] = useLexicalComposerContext();
   const tr = useTr();
 
@@ -44,12 +44,14 @@ export default function ActionsPlugin({
               key={actionItem.title}
               onSelect={actionItem.action}
               className={actionItem.type === 'danger' ? 'danger' : ''}
+              disabled={actionItem.disabled}
             >
               {actionItem.title}
             </ActionMenu.Item>
           ))}
       <ActionMenu.Item onSelect={() => copyJson(editor)}>{tr('actionCopyJSON')}</ActionMenu.Item>
       <ActionMenu.Item
+        disabled={disabled}
         className="danger"
         onSelect={() => {
           editor.dispatchCommand(CLEAR_EDITOR_COMMAND, undefined);
@@ -65,6 +67,7 @@ export default function ActionsPlugin({
               key={actionItem.title}
               onSelect={actionItem.action}
               className={actionItem.type === 'danger' ? 'danger' : ''}
+              disabled={actionItem.disabled}
             >
               {actionItem.title}
             </ActionMenu.Item>

package/src/rich-text-editor/plugins/ToolbarPlugin/index.tsx

@@ -279,13 +279,17 @@ function Divider(): JSX.Element {
   return <div className="c-rte-toolbar__divider" />;
 }
 
+type ToolbarPluginProps = {
+  actionsMenuPrepend?: CrystallizeRichTextActionMenuItem[];
+  actionsMenuAppend?: CrystallizeRichTextActionMenuItem[];
+  disabled?: boolean;
+};
+
 export default function ToolbarPlugin({
   actionsMenuPrepend,
   actionsMenuAppend,
-}: {
-  actionsMenuPrepend?: CrystallizeRichTextActionMenuItem[];
-  actionsMenuAppend?: CrystallizeRichTextActionMenuItem[];
-}): JSX.Element {
+  disabled,
+}: ToolbarPluginProps): JSX.Element {
   const [editor] = useLexicalComposerContext();
   const [activeEditor, setActiveEditor] = useState(editor);
   const [blockType, setBlockType] = useState<keyof typeof blockTypeToBlockName>('paragraph');
@@ -686,7 +690,7 @@ export default function ToolbarPlugin({
           </Dialog>
         )}
       </div>
-      <ActionsPlugin prepend={actionsMenuPrepend} append={actionsMenuAppend} />
+      <ActionsPlugin disabled={disabled} prepend={actionsMenuPrepend} append={actionsMenuAppend} />
     </div>
   );
 }

package/src/rich-text-editor/rich-text-editor.css

@@ -40,10 +40,6 @@
     @apply relative mt-2 cursor-text rounded-bl-md rounded-br-md;
   }
 
-  .c-rte-editor-container:not(.disabled) {
-    @apply bg-white;
-  }
-
   .c-rte-editor {
     @apply relative;
   }

package/src/rich-text-editor/rich-text-editor.tsx

@@ -140,7 +140,11 @@ function RichTextEditorWithoutContext({
   return (
     <>
       <OnChangePlugin onChange={onLocalChange} ignoreSelectionChange />
-      <ToolbarPlugin actionsMenuPrepend={actionsMenuPrepend} actionsMenuAppend={actionsMenuAppend} />
+      <ToolbarPlugin
+        disabled={disabled}
+        actionsMenuPrepend={actionsMenuPrepend}
+        actionsMenuAppend={actionsMenuAppend}
+      />
       {slotPreContent}
       <div className={`c-rte-editor-container ${disabled ? 'disabled' : ''}`}>
         {maxLength != null ? <MaxLengthPlugin maxLength={maxLength} /> : null}

package/src/rich-text-editor/types/types.ts

@@ -2,4 +2,5 @@ export type CrystallizeRichTextActionMenuItem = {
   title: string;
   action: () => void;
   type?: 'default' | 'danger';
+  disabled?: boolean;
 };

package/src/switch/switch.css

@@ -1,6 +1,6 @@
 .c-switch-root {
   /* @apply radix-state-checked:border-[#528693] radix-state-checked:bg-neptune h-4 w-7 rounded-full border border-solid border-[#52869399] bg-[#9095a84d] p-0 focus:outline-none focus:ring-1 focus:ring-[#528693] focus:ring-offset-1 disabled:opacity-40; */
-  @apply relative h-6 w-11 cursor-pointer rounded-full border border-solid border-purple-200-700 bg-purple-50-900 pl-0.5 transition-all hover:border-purple-300-600 focus:outline-none disabled:opacity-40 data-[state=checked]:border-green-400-500 data-[state=checked]:bg-cyan-100-800;
+  @apply relative h-6 w-11 rounded-full border border-solid border-purple-200-700 bg-purple-50-900 pl-0.5 transition-all hover:border-purple-300-600 focus:outline-none enabled:cursor-pointer disabled:opacity-40 data-[state=checked]:border-green-400-500 data-[state=checked]:bg-cyan-100-800;
 }
 
 .c-switch-thumb {