@developer_tribe/react-builder 1.2.30 → 1.2.32

package/src/utils/projectColors.ts

@@ -11,10 +11,11 @@ export const defaultProjectColors: ProjectColors = {
     TRANSPARENT: '#ffffff00',
     ONBOARD_DOT_INACTIVE: '#E4E5E7',
     ONBOARD_DOT_ACTIVE: '#007AFF',
-    ONBOARD_BUTTON_PRIMARY_BACKGROUND: '#0000FF',
-    ONBOARD_BUTTON_PRIMARY_TEXT: '#000',
+    ONBOARD_BUTTON_PRIMARY_BACKGROUND: '#0066FF',
+    ONBOARD_BUTTON_PRIMARY_TEXT: '#FFFFFF',
     ONBOARD_LINK_COLOR: '#1778F2',
     ONBOARD_SEPARATOR_COLOR: '#44454D',
+    RADIO_BUTTON_COLOR: '#A6A6A6',
   },
   THEME_COLORS: {
     light: {

package/src/utils/useMergedStyle.ts

@@ -4,13 +4,15 @@ import type { CSSProperties } from 'react';
 const EMPTY_STYLE: CSSProperties = {};
 
 export function useMergedStyle(
-  base?: CSSProperties,
-  override?: CSSProperties,
+  ...args: (CSSProperties | undefined | null | false)[]
 ): CSSProperties {
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   return useMemo(() => {
-    if (!base && !override) return EMPTY_STYLE;
-    if (!override) return base ?? EMPTY_STYLE;
-    if (!base) return override;
-    return { ...base, ...override };
-  }, [base, override]);
+    const validStyles = args.filter((arg): arg is CSSProperties => !!arg);
+
+    if (validStyles.length === 0) return EMPTY_STYLE;
+    if (validStyles.length === 1) return validStyles[0];
+
+    return Object.assign({}, ...validStyles);
+  }, args);
 }