Merge remote-tracking branch 'origin' into fix-alert-dialog-api

Author: tenphi

CHANGELOG.md

@@ -1,5 +1,25 @@
 # @cube-dev/ui-kit
 
+## 0.78.5
+
+### Patch Changes
+
+- [#805](https://github.com/cube-js/cube-ui-kit/pull/805) [`5fa85184`](https://github.com/cube-js/cube-ui-kit/commit/5fa851840db023def82f1a3838576ba8fe0d65f8) Thanks [@tenphi](https://github.com/tenphi)! - Fix the return type of the TooltipProvider the second time :)
+
+- [#805](https://github.com/cube-js/cube-ui-kit/pull/805) [`5fa85184`](https://github.com/cube-js/cube-ui-kit/commit/5fa851840db023def82f1a3838576ba8fe0d65f8) Thanks [@tenphi](https://github.com/tenphi)! - Fix DecimalDecreaseIcon and DecimalIncreaseIcon.
+
+## 0.78.4
+
+### Patch Changes
+
+- [#803](https://github.com/cube-js/cube-ui-kit/pull/803) [`a4f59bb7`](https://github.com/cube-js/cube-ui-kit/commit/a4f59bb74066d1e900fb69ab3215584182a38cb1) Thanks [@tenphi](https://github.com/tenphi)! - Fix the return type of the TooltipProvider the second time :)
+
+## 0.78.3
+
+### Patch Changes
+
+- [#801](https://github.com/cube-js/cube-ui-kit/pull/801) [`fae98647`](https://github.com/cube-js/cube-ui-kit/commit/fae98647f070ac69f6fa7abc80b5bb568896c81a) Thanks [@tenphi](https://github.com/tenphi)! - Fix the return type of TooltipProvider.
+
 ## 0.78.2
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cube-dev/ui-kit",
-  "version": "0.78.2",
+  "version": "0.78.5",
   "type": "module",
   "description": "UIKit for Cube Projects",
   "repository": {

src/components/overlays/Tooltip/TooltipProvider.tsx

@@ -1,4 +1,11 @@
-import { ReactElement, ReactNode, RefObject, useEffect, useState } from 'react';
+import {
+  isValidElement,
+  ReactElement,
+  ReactNode,
+  RefObject,
+  useEffect,
+  useState,
+} from 'react';
 
 import { Styles } from '../../../tasty';
 
@@ -11,13 +18,13 @@ import {
 
 export interface CubeTooltipProviderProps
   extends Omit<CubeTooltipTriggerProps, 'children'> {
-  children: ReactElement | TooltipTriggerFunction;
+  children: ReactNode | TooltipTriggerFunction;
   title?: ReactNode;
   tooltipStyles?: Styles;
   width?: CubeTooltipProps['width'];
 }
 
-export function TooltipProvider(props: CubeTooltipProviderProps) {
+export function TooltipProvider(props: CubeTooltipProviderProps): ReactElement {
   const [rendered, setRendered] = useState(false);
   const { title, children, tooltipStyles, width, ...otherProps } = props;
 
@@ -29,20 +36,26 @@ export function TooltipProvider(props: CubeTooltipProviderProps) {
 
   // SSR: render without tooltip
   if (!rendered) {
-    return isFunction ? (
+    return (
       <>
-        {children({}, { current: null } as unknown as RefObject<HTMLElement>)}
+        {isFunction
+          ? children({}, { current: null } as unknown as RefObject<HTMLElement>)
+          : children}
       </>
-    ) : (
-      <>{children}</>
-    );
+    ) as ReactElement;
   }
 
   // Both patterns pass through to TooltipTrigger
   // The difference is whether we pass function or element as first child
   return (
     <TooltipTrigger {...otherProps}>
-      {children}
+      {isFunction ||
+      isValidElement(children) ||
+      typeof children === 'string' ? (
+        children
+      ) : (
+        <>{children}</>
+      )}
       <Tooltip styles={tooltipStyles} {...(width ? { width } : null)}>
         {title}
       </Tooltip>

src/icons/DecimalDecreaseIcon.tsx

@@ -10,7 +10,7 @@ export const DecimalDecreaseIcon = wrapIcon(
     viewBox="0 0 24 24"
   >
     <path
-      stroke="#000"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
       strokeWidth="1.5"

src/icons/DecimalIncreaseIcon.tsx

@@ -10,7 +10,7 @@ export const DecimalIncreaseIcon = wrapIcon(
     viewBox="0 0 24 24"
   >
     <path
-      stroke="#000"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
       strokeWidth="1.5"

src/icons/Icons.stories.tsx

@@ -61,7 +61,7 @@ const Template: StoryFn<CubeIconProps> = (name) => {
 
           return (
             <Space key={iconName} gap="1x">
-              <Icon size={24} />
+              <Icon size={24} color="#purple-text" />
               <Text preset="t4">{iconName}</Text>
             </Space>
           );