orcs-design-system 3.3.32 → 3.3.34

package/es/components/Avatar/Avatar.stories.js

@@ -386,7 +386,8 @@ export const headerAvatarVariants = () => {
       headerAvatar: true,
       sizing: "small",
       image: "https://randomuser.me/api/portraits/men/32.jpg",
-      imageAlt: "Avatar for John Doe"
+      imageAlt: "Avatar for John Doe",
+      onClick: handleClick
     }), /*#__PURE__*/_jsx(Avatar, {
       headerAvatar: true,
       sizing: "large",
@@ -399,7 +400,8 @@ export const headerAvatarVariants = () => {
       sizing: "small",
       shape: "square",
       image: "https://images.unsplash.com/photo-1464802686167-b939a6910659?q=80&w=3500&auto=format&fit=crop&ixlib=rb-4.1.0&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
-      imageAlt: "Avatar for Nebula UI"
+      imageAlt: "Avatar for Nebula UI",
+      onClick: handleClick
     })]
   });
 };

package/es/components/Avatar/index.js

@@ -360,47 +360,54 @@ const HeaderAvatarShape = styled("div").withConfig({
     })
   };
 });
-const HeaderAvatarActionPopover = styled(Popover).withConfig({
-  displayName: "Avatar__HeaderAvatarActionPopover",
+const HeaderAvatarAction = styled("button").withConfig({
+  displayName: "Avatar__HeaderAvatarAction",
   componentId: "sc-1wtet2j-11"
+})(() => ({
+  cursor: "pointer",
+  padding: "0",
+  background: "none",
+  border: "none",
+  outline: "none",
+  appearance: "none",
+  position: "relative",
+  "&:hover": {
+    "& > .icon-container": {
+      opacity: "1"
+    }
+  }
+}));
+const IconContainer = styled("div").withConfig({
+  displayName: "Avatar__IconContainer",
+  componentId: "sc-1wtet2j-12"
 })(_ref6 => {
   let {
-    $shape
+    $shape,
+    $sizing
   } = _ref6;
   return {
+    opacity: "0",
+    transition: "opacity 0.2s ease-in-out",
     position: "absolute",
-    top: 0,
-    right: 0,
-    transform: $shape === "circle" ? "translate(-5%, 5%)" : "translate(20%, -20%)"
-  };
-});
-const HeaderAvatarAction = styled("button").withConfig({
-  displayName: "Avatar__HeaderAvatarAction",
-  componentId: "sc-1wtet2j-12"
-})(_ref7 => {
-  let {
-    ...props
-  } = _ref7;
-  return {
-    width: "36px",
-    height: "36px",
-    borderRadius: "50%",
-    background: "#e6e6e6",
-    border: "solid 2px #fff",
-    boxShadow: "0 2px 8px 0 rgba(0,0,0,0.10)",
+    top: $sizing === "large" ? "6px" : "4px",
+    left: $sizing === "large" ? "6px" : "4px",
+    width: $sizing === "large" ? "calc(100% - 12px)" : "calc(100% - 8px)",
+    height: $sizing === "large" ? "calc(100% - 18px)" : "calc(100% - 12px)",
     display: "flex",
     alignItems: "center",
     justifyContent: "center",
-    cursor: "pointer",
-    zIndex: 2,
-    padding: 0,
-    transition: "background 0.2s ease-in-out",
-    "&:hover, &:focus": {
-      background: themeGet("colors.primaryLighter")(props)
-    }
+    background: "rgba(0, 0, 0, 0.5)",
+    zIndex: "2",
+    borderRadius: $shape === "circle" || !$shape ? "50%" : "0",
+    ...($shape === "hexagon" && {
+      clipPath: "polygon(50% 0, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%)"
+    }),
+    ...($shape === "tag" && {
+      clipPath: "polygon(6% 0, 95% 0, 95% 65%, 50% 100%, 6% 65%)"
+    })
   };
 });
-const Avatar = _ref8 => {
+const Avatar = _ref7 => {
   let {
     sizing,
     image,
@@ -419,7 +426,7 @@ const Avatar = _ref8 => {
     headerAvatar = false,
     onClick,
     ...props
-  } = _ref8;
+  } = _ref7;
   const hasTitle = !!title;
   const hasSubtitle = !!subtitle;
   const hasSubtitleContent = !!subtitleContent;
@@ -443,11 +450,11 @@ const Avatar = _ref8 => {
         theme
       }) || customSize;
     }
-    return /*#__PURE__*/_jsxs(HeaderAvatarWrapper, {
+    const avatarContent = /*#__PURE__*/_jsx(HeaderAvatarWrapper, {
       ...props,
       $size: size,
       $shape: shape,
-      children: [/*#__PURE__*/_jsx(HeaderAvatarBorder, {
+      children: /*#__PURE__*/_jsx(HeaderAvatarBorder, {
         $size: size,
         $shape: shape,
         $sizing: sizing,
@@ -469,27 +476,35 @@ const Avatar = _ref8 => {
             icon: ["fas", "user"]
           })
         })
-      }), onClick && sizing === "large" && /*#__PURE__*/_jsx(HeaderAvatarActionPopover, {
+      })
+    });
+    if (onClick) {
+      return /*#__PURE__*/_jsx(Popover, {
         direction: "right",
         width: "fit-content",
         $shape: shape,
         text: shape === "circle" ? "Upload profile picture" : "Change image",
-        children: /*#__PURE__*/_jsx(HeaderAvatarAction, {
+        children: /*#__PURE__*/_jsxs(HeaderAvatarAction, {
           onClick: onClick,
           "aria-label": "Edit avatar",
-          children: shape === "circle" ? /*#__PURE__*/_jsx(Icon, {
-            icon: ["fas", "camera"],
-            size: "lg",
-            color: "greyDarker"
-          }) : /*#__PURE__*/_jsx(Icon, {
-            icon: ["fas", "edit"],
-            size: "lg",
-            color: "greyDarker",
-            transform: "right-1"
-          })
+          children: [/*#__PURE__*/_jsx(IconContainer, {
+            $shape: shape,
+            $sizing: sizing,
+            className: "icon-container",
+            children: shape === "circle" ? /*#__PURE__*/_jsx(Icon, {
+              icon: ["fas", "camera"],
+              size: sizing === "large" ? "lg" : "1x",
+              color: "white"
+            }) : /*#__PURE__*/_jsx(Icon, {
+              icon: ["fas", "image"],
+              size: sizing === "large" ? "lg" : "1x",
+              color: "white"
+            })
+          }), avatarContent]
         })
-      })]
-    });
+      });
+    }
+    return avatarContent;
   }
   const component = /*#__PURE__*/_jsxs(AvatarWrapper, {
     ...props,

package/es/components/ColorPicker/index.js

@@ -1,14 +1,17 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useMemo } from "react";
 import PropTypes from "prop-types";
 import Box from "../Box";
 import ColorPickerLib from "react-best-gradient-color-picker";
+import { FloatingPortal } from "@floating-ui/react";
+import { getFloatingUiRootElement } from "../../utils/floatingUiHelpers";
+import useActionMenu from "../ActionsMenu/useActionMenu";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ColorPicker = _ref => {
   let {
     value,
     onChange,
     children,
-    position = "bottom-start",
+    position = "bottom-end",
     zIndex = 20,
     bg = "#202020",
     p = "s",
@@ -33,131 +36,52 @@ const ColorPicker = _ref => {
     ...colorPickerProps
   } = _ref;
   const [isOpen, setIsOpen] = useState(false);
-  const colorPickerRef = useRef(null);
-  const triggerRef = useRef(null);
-
-  // Handle clicks outside to close
-  useEffect(() => {
-    function handleClickOutside(event) {
-      if (colorPickerRef.current && !colorPickerRef.current.contains(event.target) && triggerRef.current && !triggerRef.current.contains(event.target)) {
-        setIsOpen(false);
-      }
-    }
-    if (isOpen) {
-      document.addEventListener("mousedown", handleClickOutside);
-      return () => {
-        document.removeEventListener("mousedown", handleClickOutside);
-      };
-    }
-    return undefined;
-  }, [isOpen]);
   const toggleColorPicker = () => setIsOpen(!isOpen);
-
-  // Calculate position based on position prop
-  const getPositionStyles = () => {
-    const baseStyles = {
-      position: "absolute",
-      zIndex,
-      bg,
-      p,
-      borderRadius
-    };
-    switch (position) {
-      case "top-start":
-        return {
-          ...baseStyles,
-          bottom: "100%",
-          right: "0",
-          mb: "s"
-        };
-      case "top-end":
-        return {
-          ...baseStyles,
-          bottom: "100%",
-          left: "0",
-          mb: "s"
-        };
-      case "bottom-start":
-        return {
-          ...baseStyles,
-          top: "100%",
-          right: "0",
-          mt: "s"
-        };
-      case "bottom-end":
-        return {
-          ...baseStyles,
-          top: "100%",
-          left: "0",
-          mt: "s"
-        };
-      case "left-start":
-        return {
-          ...baseStyles,
-          right: "100%",
-          top: "0",
-          mr: "s"
-        };
-      case "left-end":
-        return {
-          ...baseStyles,
-          right: "100%",
-          bottom: "0",
-          mr: "s"
-        };
-      case "right-start":
-        return {
-          ...baseStyles,
-          left: "100%",
-          top: "0",
-          ml: "s"
-        };
-      case "right-end":
-        return {
-          ...baseStyles,
-          left: "100%",
-          bottom: "0",
-          ml: "s"
-        };
-      default:
-        return {
-          ...baseStyles,
-          top: "100%",
-          right: "0",
-          mt: "s"
-        };
-    }
-  };
+  const baseStyles = useMemo(() => ({
+    zIndex,
+    bg,
+    p,
+    borderRadius
+  }), [zIndex, bg, p, borderRadius]);
+  const actionMenu = useActionMenu({
+    placement: position,
+    open: isOpen,
+    onOpenChange: setIsOpen
+  });
   return /*#__PURE__*/_jsxs(Box, {
-    position: "relative",
-    children: [/*#__PURE__*/_jsx(Box, {
-      ref: triggerRef,
-      children: typeof children === "function" ? children({
-        isOpen,
-        toggleColorPicker
-      }) : children
-    }), isOpen && /*#__PURE__*/_jsx(Box, {
-      ref: colorPickerRef,
-      ...getPositionStyles(),
-      children: /*#__PURE__*/_jsx(ColorPickerLib, {
-        value: value,
-        onChange: onChange,
-        width: width,
-        height: height,
-        hidePresets: hidePresets,
-        hideInputs: hideInputs,
-        hideControls: hideControls,
-        hideOpacity: hideOpacity,
-        hideEyeDrop: hideEyeDrop,
-        hideAdvancedSliders: hideAdvancedSliders,
-        hideColorGuide: hideColorGuide,
-        hideInputType: hideInputType,
-        hideColorTypeBtns: hideColorTypeBtns,
-        hideGradientType: hideGradientType,
-        hideGradientAngle: hideGradientAngle,
-        hideGradientStop: hideGradientStop,
-        hideGradientControls: hideGradientControls,
-        ...colorPickerProps
+    ref: actionMenu.refs.setReference,
+    ...actionMenu.getReferenceProps(),
+    children: [typeof children === "function" ? children({
+      isOpen,
+      toggleColorPicker
+    }) : children, isOpen && /*#__PURE__*/_jsx(FloatingPortal, {
+      root: getFloatingUiRootElement(actionMenu.refs.reference),
+      preserveTabOrder: true,
+      children: /*#__PURE__*/_jsx(Box, {
+        ref: actionMenu.refs.setFloating,
+        style: actionMenu.floatingStyles,
+        ...baseStyles,
+        ...actionMenu.getFloatingProps(),
+        children: /*#__PURE__*/_jsx(ColorPickerLib, {
+          value: value,
+          onChange: onChange,
+          width: width,
+          height: height,
+          hidePresets: hidePresets,
+          hideInputs: hideInputs,
+          hideControls: hideControls,
+          hideOpacity: hideOpacity,
+          hideEyeDrop: hideEyeDrop,
+          hideAdvancedSliders: hideAdvancedSliders,
+          hideColorGuide: hideColorGuide,
+          hideInputType: hideInputType,
+          hideColorTypeBtns: hideColorTypeBtns,
+          hideGradientType: hideGradientType,
+          hideGradientAngle: hideGradientAngle,
+          hideGradientStop: hideGradientStop,
+          hideGradientControls: hideGradientControls,
+          ...colorPickerProps
+        })
       })
     })]
   });
@@ -197,7 +121,7 @@ ColorPicker.__docgenInfo = {
   "props": {
     "position": {
       "defaultValue": {
-        "value": "\"bottom-start\"",
+        "value": "\"bottom-end\"",
         "computed": false
       },
       "description": "",

package/es/components/Modal/index.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import ReactDOM from "react-dom";
 import PropTypes from "prop-types";
 import styled, { keyframes, ThemeProvider } from "styled-components";
@@ -72,6 +72,8 @@ const Modal = _ref => {
     ...restProps
   } = _ref;
   const [lastActiveElement, setLastActiveElement] = useState(null);
+  const [isSelectingText, setIsSelectingText] = useState(false);
+  const isSelectingTextRef = useRef(false);
   const ariaLabel = useMemo(() => {
     if (restProps.ariaLabel) {
       return restProps.ariaLabel;
@@ -101,28 +103,51 @@ const Modal = _ref => {
       focusLastActiveElement();
     }
   }, [visible, focusLastActiveElement, lastActiveElement]);
+  useEffect(() => {
+    isSelectingTextRef.current = isSelectingText;
+  }, [isSelectingText]);
   useEffect(() => {
     if (!visible) return;
 
     /* Adding onClick handler on the Overlay does not work.
      * So we add a global listener and check if the element clicked is the
-     * overlay vida overlayID.
+     * overlay via overlayID.
      */
-    const handler = e => {
+    const handleMouseDown = e => {
+      // Check if the user is starting to select text
+      if (e.target.closest(`#${modalID}`)) {
+        setIsSelectingText(true);
+      }
+    };
+    const handleMouseUp = () => {
+      // Reset text selection state after a short delay
+      setTimeout(() => {
+        setIsSelectingText(false);
+      }, 100);
+    };
+    const handleClick = e => {
+      if (e.target.id === overlayID && !isSelectingTextRef.current) {
+        onClose();
+      }
+    };
+    const handleTouchStart = e => {
       if (e.target.id === overlayID) {
         onClose();
       }
     };
-    const eventTypes = ["touchstart", "click"];
-    eventTypes.map(type => {
-      window.addEventListener(type, handler, true);
-    });
+
+    // Add event listeners
+    window.addEventListener("mousedown", handleMouseDown, true);
+    window.addEventListener("mouseup", handleMouseUp, true);
+    window.addEventListener("click", handleClick, true);
+    window.addEventListener("touchstart", handleTouchStart, true);
     return () => {
-      eventTypes.map(type => {
-        window.removeEventListener(type, handler, true);
-      });
+      window.removeEventListener("mousedown", handleMouseDown, true);
+      window.removeEventListener("mouseup", handleMouseUp, true);
+      window.removeEventListener("click", handleClick, true);
+      window.removeEventListener("touchstart", handleTouchStart, true);
     };
-  }, [visible, onClose, overlayID]);
+  }, [visible, onClose, overlayID, modalID]);
   if (!visible) return null;
   const component = /*#__PURE__*/_jsx(Overlay, {
     alignItems: "center",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orcs-design-system",
-  "version": "3.3.32",
+  "version": "3.3.34",
   "engines": {
     "node": "20.12.2"
   },