@fileverse-dev/fortune-react 1.0.2-mod-107 → 1.0.2-mod-109

package/dist/components/Toolbar/Combo.d.ts

@@ -6,6 +6,7 @@ type Props = {
     showArrow?: boolean;
     onClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     children: (setOpen: React.Dispatch<React.SetStateAction<boolean>>) => React.ReactNode;
+    fillColor?: string;
 };
 declare const Combo: React.FC<Props>;
 export default Combo;

package/dist/index.css

@@ -1627,28 +1627,12 @@ line-height: 16px; /* 133.333% */
 
 .fortune-insert-button {
   width: 100% !important;
-  background-color: #000 !important;
-  color: white !important;
   border: none !important;
   border-radius: 6px !important;
   padding: 12px !important;
   font-weight: 500 !important;
 }
 
-.fortune-insert-button:hover {
-  background-color: #333 !important;
-}
-
-.fortune-insert-button:disabled {
-  background-color: #ccc !important;
-  color: #666 !important;
-  cursor: not-allowed !important;
-}
-
-.fortune-insert-button:disabled:hover {
-  background-color: #ccc !important;
-}
-
 .fortune-link-modify-modal.link-toolbar {
   display: flex;
   flex-direction: row;
@@ -2672,6 +2656,10 @@ input[type="number"].condition-rules-project-input {
   gap: 4px;
 }
 
+.custom-color-button > svg > path:first-child {
+  display: none !important;
+}
+
 #fortune-split-column {
   /* position: absolute;
     padding: 30px 42px;

package/dist/index.esm.css

@@ -1627,28 +1627,12 @@ line-height: 16px; /* 133.333% */
 
 .fortune-insert-button {
   width: 100% !important;
-  background-color: #000 !important;
-  color: white !important;
   border: none !important;
   border-radius: 6px !important;
   padding: 12px !important;
   font-weight: 500 !important;
 }
 
-.fortune-insert-button:hover {
-  background-color: #333 !important;
-}
-
-.fortune-insert-button:disabled {
-  background-color: #ccc !important;
-  color: #666 !important;
-  cursor: not-allowed !important;
-}
-
-.fortune-insert-button:disabled:hover {
-  background-color: #ccc !important;
-}
-
 .fortune-link-modify-modal.link-toolbar {
   display: flex;
   flex-direction: row;
@@ -2672,6 +2656,10 @@ input[type="number"].condition-rules-project-input {
   gap: 4px;
 }
 
+.custom-color-button > svg > path:first-child {
+  display: none !important;
+}
+
 #fortune-split-column {
   /* position: absolute;
     padding: 30px 42px;

package/dist/index.esm.js

@@ -1110,7 +1110,7 @@ var FormulaHint = function FormulaHint(props) {
     style: {
       display: "flex",
       justifyContent: "end",
-      minWidth: "68px",
+      minWidth: "75px",
       height: "20px",
       alignItems: "center",
       gap: "6px"
@@ -1121,6 +1121,12 @@ var FormulaHint = function FormulaHint(props) {
     style: {
       width: "16px"
     }
+  })), fn.SECONDARY_LOGO && (/*#__PURE__*/React.createElement("img", {
+    src: fn.SECONDARY_LOGO,
+    alt: "Service Logo",
+    style: {
+      width: "16px"
+    }
   })), fn.API_KEY && (/*#__PURE__*/React.createElement("div", {
     style: {
       borderRadius: "4px",
@@ -1936,7 +1942,7 @@ var SearchReplace = function SearchReplace(_ref) {
   }), /*#__PURE__*/React.createElement("span", null, findAndReplace.wholeTextbox)))), /*#__PURE__*/React.createElement(Divider$2, {
     className: "w-full border-t-[1px]"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "flex flex-row gap-2 justify-center items-center mb-4"
+    className: "flex flex-row gap-2 justify-end items-center mb-4"
   }, /*#__PURE__*/React.createElement(Button$1, {
     id: "replaceAllBtn",
     variant: "secondary",
@@ -4558,7 +4564,7 @@ var Button = function Button(_ref) {
     tabIndex: 0,
     role: "button",
     style: selected ? {
-      backgroundColor: "#E7E5EB"
+      backgroundColor: "#FFDF0A"
     } : style
   }, /*#__PURE__*/React.createElement(LucideIcon, {
     name: getLucideIcon(iconId),
@@ -4588,7 +4594,8 @@ var Combo = function Combo(_ref) {
     iconId = _ref.iconId,
     _ref$showArrow = _ref.showArrow,
     showArrow = _ref$showArrow === void 0 ? true : _ref$showArrow,
-    children = _ref.children;
+    children = _ref.children,
+    fillColor = _ref.fillColor;
   var style = {
     userSelect: "none"
   };
@@ -4598,7 +4605,7 @@ var Combo = function Combo(_ref) {
     setOpen = _useState2[1];
   var buttonRef = useRef(null);
   var isLucideIcon = useMemo(function () {
-    return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template"].includes(iconId);
+    return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template", "font-color", "background"].includes(iconId);
   }, [iconId]);
   var trigger = !isLucideIcon ? (/*#__PURE__*/React.createElement(Tooltip, {
     text: tooltip,
@@ -4629,7 +4636,12 @@ var Combo = function Combo(_ref) {
     onClick: function onClick() {
       return setOpen(!open);
     },
-    className: "fortune-toolbar-combo-button"
+    className: cn("fortune-toolbar-combo-button", {
+      "custom-color-button": iconId === "font-color" && fillColor
+    }),
+    style: {
+      color: iconId === "font-color" ? fillColor : undefined
+    }
   })));
   return /*#__PURE__*/React.createElement("div", {
     ref: buttonRef,
@@ -5336,7 +5348,7 @@ var CustomButton = function CustomButton(_ref) {
     tabIndex: 0,
     role: "button",
     style: selected ? {
-      backgroundColor: "#E7E5EB"
+      backgroundColor: "#FFDF0A"
     } : {}
   }, /*#__PURE__*/React.createElement(CustomIcon, {
     width: 16,
@@ -5870,18 +5882,19 @@ var Toolbar = function Toolbar(_ref) {
         key: name
       }, /*#__PURE__*/React.createElement("div", {
         style: {
-          width: 17,
-          height: 2,
+          width: 24,
+          height: 4,
           backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
           position: "absolute",
-          bottom: 8,
-          left: 9,
+          bottom: 2,
+          left: 3,
           zIndex: 100
         }
       }), /*#__PURE__*/React.createElement(Combo, {
         iconId: name,
         tooltip: tooltip,
         showArrow: false,
+        fillColor: name === "font-color" ? refs.globalCache.recentTextColor : undefined,
         onClick: function onClick() {
           var color = name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor;
           if (color) pick(color);

package/dist/index.js

@@ -1122,7 +1122,7 @@ var FormulaHint = function FormulaHint(props) {
     style: {
       display: "flex",
       justifyContent: "end",
-      minWidth: "68px",
+      minWidth: "75px",
       height: "20px",
       alignItems: "center",
       gap: "6px"
@@ -1133,6 +1133,12 @@ var FormulaHint = function FormulaHint(props) {
     style: {
       width: "16px"
     }
+  })), fn.SECONDARY_LOGO && (/*#__PURE__*/React__default['default'].createElement("img", {
+    src: fn.SECONDARY_LOGO,
+    alt: "Service Logo",
+    style: {
+      width: "16px"
+    }
   })), fn.API_KEY && (/*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       borderRadius: "4px",
@@ -1948,7 +1954,7 @@ var SearchReplace = function SearchReplace(_ref) {
   }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.wholeTextbox)))), /*#__PURE__*/React__default['default'].createElement(ui.Divider, {
     className: "w-full border-t-[1px]"
   }), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "flex flex-row gap-2 justify-center items-center mb-4"
+    className: "flex flex-row gap-2 justify-end items-center mb-4"
   }, /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     id: "replaceAllBtn",
     variant: "secondary",
@@ -4570,7 +4576,7 @@ var Button = function Button(_ref) {
     tabIndex: 0,
     role: "button",
     style: selected ? {
-      backgroundColor: "#E7E5EB"
+      backgroundColor: "#FFDF0A"
     } : style
   }, /*#__PURE__*/React__default['default'].createElement(ui.LucideIcon, {
     name: getLucideIcon(iconId),
@@ -4600,7 +4606,8 @@ var Combo = function Combo(_ref) {
     iconId = _ref.iconId,
     _ref$showArrow = _ref.showArrow,
     showArrow = _ref$showArrow === void 0 ? true : _ref$showArrow,
-    children = _ref.children;
+    children = _ref.children,
+    fillColor = _ref.fillColor;
   var style = {
     userSelect: "none"
   };
@@ -4610,7 +4617,7 @@ var Combo = function Combo(_ref) {
     setOpen = _useState2[1];
   var buttonRef = React.useRef(null);
   var isLucideIcon = React.useMemo(function () {
-    return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template"].includes(iconId);
+    return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template", "font-color", "background"].includes(iconId);
   }, [iconId]);
   var trigger = !isLucideIcon ? (/*#__PURE__*/React__default['default'].createElement(ui.Tooltip, {
     text: tooltip,
@@ -4641,7 +4648,12 @@ var Combo = function Combo(_ref) {
     onClick: function onClick() {
       return setOpen(!open);
     },
-    className: "fortune-toolbar-combo-button"
+    className: ui.cn("fortune-toolbar-combo-button", {
+      "custom-color-button": iconId === "font-color" && fillColor
+    }),
+    style: {
+      color: iconId === "font-color" ? fillColor : undefined
+    }
   })));
   return /*#__PURE__*/React__default['default'].createElement("div", {
     ref: buttonRef,
@@ -5348,7 +5360,7 @@ var CustomButton = function CustomButton(_ref) {
     tabIndex: 0,
     role: "button",
     style: selected ? {
-      backgroundColor: "#E7E5EB"
+      backgroundColor: "#FFDF0A"
     } : {}
   }, /*#__PURE__*/React__default['default'].createElement(CustomIcon, {
     width: 16,
@@ -5882,18 +5894,19 @@ var Toolbar = function Toolbar(_ref) {
         key: name
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
-          width: 17,
-          height: 2,
+          width: 24,
+          height: 4,
           backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
           position: "absolute",
-          bottom: 8,
-          left: 9,
+          bottom: 2,
+          left: 3,
           zIndex: 100
         }
       }), /*#__PURE__*/React__default['default'].createElement(Combo, {
         iconId: name,
         tooltip: tooltip,
         showArrow: false,
+        fillColor: name === "font-color" ? refs.globalCache.recentTextColor : undefined,
         onClick: function onClick() {
           var color = name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor;
           if (color) pick(color);

package/dist/index.umd.css

@@ -1627,28 +1627,12 @@ line-height: 16px; /* 133.333% */
 
 .fortune-insert-button {
   width: 100% !important;
-  background-color: #000 !important;
-  color: white !important;
   border: none !important;
   border-radius: 6px !important;
   padding: 12px !important;
   font-weight: 500 !important;
 }
 
-.fortune-insert-button:hover {
-  background-color: #333 !important;
-}
-
-.fortune-insert-button:disabled {
-  background-color: #ccc !important;
-  color: #666 !important;
-  cursor: not-allowed !important;
-}
-
-.fortune-insert-button:disabled:hover {
-  background-color: #ccc !important;
-}
-
 .fortune-link-modify-modal.link-toolbar {
   display: flex;
   flex-direction: row;
@@ -2672,6 +2656,10 @@ input[type="number"].condition-rules-project-input {
   gap: 4px;
 }
 
+.custom-color-button > svg > path:first-child {
+  display: none !important;
+}
+
 #fortune-split-column {
   /* position: absolute;
     padding: 30px 42px;

package/dist/index.umd.js

@@ -105915,7 +105915,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       style: {
         display: "flex",
         justifyContent: "end",
-        minWidth: "68px",
+        minWidth: "75px",
         height: "20px",
         alignItems: "center",
         gap: "6px"
@@ -105926,6 +105926,12 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       style: {
         width: "16px"
       }
+    })), fn.SECONDARY_LOGO && (/*#__PURE__*/React__default['default'].createElement("img", {
+      src: fn.SECONDARY_LOGO,
+      alt: "Service Logo",
+      style: {
+        width: "16px"
+      }
     })), fn.API_KEY && (/*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         borderRadius: "4px",
@@ -106741,7 +106747,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.wholeTextbox)))), /*#__PURE__*/React__default['default'].createElement(o8, {
       className: "w-full border-t-[1px]"
     }), /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "flex flex-row gap-2 justify-center items-center mb-4"
+      className: "flex flex-row gap-2 justify-end items-center mb-4"
     }, /*#__PURE__*/React__default['default'].createElement(_t, {
       id: "replaceAllBtn",
       variant: "secondary",
@@ -109363,7 +109369,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       tabIndex: 0,
       role: "button",
       style: selected ? {
-        backgroundColor: "#E7E5EB"
+        backgroundColor: "#FFDF0A"
       } : style
     }, /*#__PURE__*/React__default['default'].createElement(Ce, {
       name: getLucideIcon(iconId),
@@ -109393,7 +109399,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       iconId = _ref.iconId,
       _ref$showArrow = _ref.showArrow,
       showArrow = _ref$showArrow === void 0 ? true : _ref$showArrow,
-      children = _ref.children;
+      children = _ref.children,
+      fillColor = _ref.fillColor;
     var style = {
       userSelect: "none"
     };
@@ -109403,7 +109410,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       setOpen = _useState2[1];
     var buttonRef = React.useRef(null);
     var isLucideIcon = React.useMemo(function () {
-      return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template"].includes(iconId);
+      return (iconId === null || iconId === void 0 ? void 0 : iconId.startsWith("align-")) || ["text-overflow", "text-wrap", "text-clip", "font-color", "background", "border-all", "merge-all", "format", "conditionFormat", "filter", "comment", "image", "formula-sum", "dune", "template", "font-color", "background"].includes(iconId);
     }, [iconId]);
     var trigger = !isLucideIcon ? (/*#__PURE__*/React__default['default'].createElement(Ts, {
       text: tooltip,
@@ -109434,7 +109441,12 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       onClick: function onClick() {
         return setOpen(!open);
       },
-      className: "fortune-toolbar-combo-button"
+      className: S$1("fortune-toolbar-combo-button", {
+        "custom-color-button": iconId === "font-color" && fillColor
+      }),
+      style: {
+        color: iconId === "font-color" ? fillColor : undefined
+      }
     })));
     return /*#__PURE__*/React__default['default'].createElement("div", {
       ref: buttonRef,
@@ -110141,7 +110153,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       tabIndex: 0,
       role: "button",
       style: selected ? {
-        backgroundColor: "#E7E5EB"
+        backgroundColor: "#FFDF0A"
       } : {}
     }, /*#__PURE__*/React__default['default'].createElement(CustomIcon, {
       width: 16,
@@ -110675,18 +110687,19 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           key: name
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           style: {
-            width: 17,
-            height: 2,
+            width: 24,
+            height: 4,
             backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
             position: "absolute",
-            bottom: 8,
-            left: 9,
+            bottom: 2,
+            left: 3,
             zIndex: 100
           }
         }), /*#__PURE__*/React__default['default'].createElement(Combo, {
           iconId: name,
           tooltip: tooltip,
           showArrow: false,
+          fillColor: name === "font-color" ? refs.globalCache.recentTextColor : undefined,
           onClick: function onClick() {
             var color = name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor;
             if (color) pick(color);