Merge pull request #444 from rozzilla/chore/types/update

Author: leorossi

index.d.ts

@@ -39,26 +39,18 @@ declare module "@platformatic/ui-components" {
     position?: string;
   }
 
-  export interface IconsType {
-    CircleStopIcon: ComponentType<any>;
-    RunningIcon: ComponentType<any>;
-    [key: string]: string | ComponentType<any>;
-  }
-
   export const PlatformaticIcon: ComponentType<PlatformaticIconProps>;
   export const CopyAndPaste: ComponentType<CopyAndPasteProps>;
-  export const Icons: IconsType;
-}
 
-declare module "@platformatic/ui-components/src/components/icons" {
   interface IconProps {
     size?: string;
     color?: string;
     addImportantToColor?: boolean;
     className?: string;
   }
 
-  const Icons: {
+  export const Icons: {
+    AppIcon: ComponentType<IconProps>;
     AlertIcon: ComponentType<IconProps>;
     ArrowUpIcon: ComponentType<IconProps>;
     ArrowDownIcon: ComponentType<IconProps>;
@@ -67,36 +59,6 @@ declare module "@platformatic/ui-components/src/components/icons" {
     [key: string]: ComponentType<IconProps>;
   };
 
-  export default Icons;
-}
-
-declare module "@platformatic/ui-components/src/components/constants" {
-  export const WHITE: string;
-  export const SMALL: string;
-  export const POSITION_END: string;
-  export const RICH_BLACK: string;
-  export const BLACK_RUSSIAN: string;
-  export const TRANSPARENT: string;
-  export const MARGIN_0: string;
-  export const OPACITY_15: string;
-  export const OPACITY_30: string;
-  export const OPACITY_100: string;
-  export const WARNING_YELLOW: string;
-  export const ANTI_FLASH_WHITE: string;
-  export const DULLS_BACKGROUND_COLOR: string;
-  export const ERROR_RED: string;
-  export const LARGE: string;
-  export const MEDIUM: string;
-  export const MAIN_GREEN: string;
-  export const BOX_SHADOW: string;
-  export const UNDERLINE: string;
-  export const MAIN_DARK_BLUE: string;
-  export const DIRECTION_RIGHT: string;
-  export const POSITION_CENTER: string;
-  export const TINY: string;
-}
-
-declare module "@platformatic/ui-components/src/components/forms" {
   interface ToggleSwitchProps {
     label?: string;
     labelClassName?: string;
@@ -147,13 +109,11 @@ declare module "@platformatic/ui-components/src/components/forms" {
     disabled?: boolean;
   }
 
-  const Forms: {
+  export const Forms: {
     ToggleSwitch: ComponentType<ToggleSwitchProps>;
     Input: ComponentType<InputProps>;
     Select: ComponentType<SelectProps>;
     Checkbox: ComponentType<CheckboxProps>;
     RadioButton: ComponentType<RadioButtonProps>;
   };
-
-  export default Forms;
 }

src/components/index.d.ts

@@ -0,0 +1,25 @@
+declare module "@platformatic/ui-components/src/components/constants" {
+  export const WHITE: string;
+  export const SMALL: string;
+  export const POSITION_END: string;
+  export const RICH_BLACK: string;
+  export const BLACK_RUSSIAN: string;
+  export const TRANSPARENT: string;
+  export const MARGIN_0: string;
+  export const OPACITY_15: string;
+  export const OPACITY_30: string;
+  export const OPACITY_100: string;
+  export const WARNING_YELLOW: string;
+  export const ANTI_FLASH_WHITE: string;
+  export const DULLS_BACKGROUND_COLOR: string;
+  export const ERROR_RED: string;
+  export const LARGE: string;
+  export const MEDIUM: string;
+  export const MAIN_GREEN: string;
+  export const BOX_SHADOW: string;
+  export const UNDERLINE: string;
+  export const MAIN_DARK_BLUE: string;
+  export const DIRECTION_RIGHT: string;
+  export const POSITION_CENTER: string;
+  export const TINY: string;
+}

test-d/index.test-d.ts

@@ -12,12 +12,25 @@ import {
   TooltipAbsolute,
   PlatformaticIconProps,
   CopyAndPasteProps,
-  IconsType,
   PlatformaticIcon,
   CopyAndPaste,
   Icons,
+  Forms,
+  ToggleSwitchProps,
+  InputProps,
+  SelectProps,
+  CheckboxProps,
+  RadioButtonProps,
+  IconProps,
 } from "@platformatic/ui-components";
 
+// Test that Forms components are properly typed as React ComponentType
+expectType<ComponentType<ToggleSwitchProps>>(Forms.ToggleSwitch);
+expectType<ComponentType<InputProps>>(Forms.Input);
+expectType<ComponentType<SelectProps>>(Forms.Select);
+expectType<ComponentType<CheckboxProps>>(Forms.Checkbox);
+expectType<ComponentType<RadioButtonProps>>(Forms.RadioButton);
+
 // Test VerticalSeparatorProps interface
 expectAssignable<VerticalSeparatorProps>({});
 expectAssignable<VerticalSeparatorProps>({
@@ -70,17 +83,10 @@ expectType<ComponentType<any>>(TooltipAbsolute);
 expectType<ComponentType<PlatformaticIconProps>>(PlatformaticIcon);
 expectType<ComponentType<CopyAndPasteProps>>(CopyAndPaste);
 
-// Test IconsType
-expectAssignable<IconsType>({
-  CircleStopIcon: (() => null) as ComponentType<any>,
-  RunningIcon: (() => null) as ComponentType<any>,
-  customIcon: "string-value",
-});
-
 // Test specific Icons exports
-expectType<ComponentType<any>>(Icons.CircleStopIcon);
-expectType<ComponentType<any>>(Icons.RunningIcon);
+expectType<ComponentType<IconProps>>(Icons.CircleStopIcon);
+expectType<ComponentType<IconProps>>(Icons.RunningIcon);
 
 // Test that Icons allows string index access
 const dynamicIcon: string | ComponentType<any> = Icons["someIconName"];
-expectType<string | ComponentType<any>>(dynamicIcon);
+expectType<ComponentType<any>>(dynamicIcon);