Refactored button

libs/generic-view/models/src/index.ts

@@ -59,6 +59,7 @@ import { entitiesLoader } from "./lib/entities-loader"
 import { conditionalRenderer } from "./lib/conditional-renderer"
 import { toast } from "./lib/toast"
 import { selectionManager } from "./lib/selection-manager"
+import { formatMessage } from "./lib/format-message"
 
 export * from "./lib/block-box"
 export * from "./lib/block-plain"
@@ -111,6 +112,7 @@ export * from "./lib/form-conditional-renderer"
 export * from "./lib/entities-loader"
 export * from "./lib/common-validators"
 export * from "./lib/conditional-renderer"
+export * from "./lib/format-message"
 export * from "./lib/toast"
 export * from "./lib/selection-manager"
 
@@ -169,6 +171,7 @@ export default {
   [tableCell.key]: tableCell,
   [entitiesLoader.key]: entitiesLoader,
   [conditionalRenderer.key]: conditionalRenderer,
+  [formatMessage.key]: formatMessage,
   [toast.key]: toast,
   [selectionManager.key]: selectionManager,
 } as const

libs/generic-view/models/src/lib/button-primary.ts

@@ -10,7 +10,7 @@ import { buttonActionsValidator } from "./common-validators"
 const dataValidator = z.undefined()
 
 const configValidator = z.object({
-  text: z.string(),
+  text: z.string().optional(),
   icon: z.nativeEnum(IconType).optional(),
   actions: buttonActionsValidator,
   disabled: z.boolean().optional(),

libs/generic-view/ui/src/lib/buttons/button-primary.tsx

@@ -20,7 +20,7 @@ export const ButtonPrimary: APIFC<undefined, ButtonPrimaryConfig> = ({
     <Button {...props} disabled={config.disabled} actions={config.actions}>
       {children}
       {config.icon && <Icon data={{ type: config.icon }} />}
-      <span>{config.text}</span>
+      {config.text ? <span>{config.text}</span> : null}
     </Button>
   )
 }

libs/generic-view/ui/src/lib/interactive/interactive.ts

@@ -9,7 +9,9 @@ import { ProgressBar } from "./progress-bar/progress-bar"
 import Form from "./form/form"
 import Tooltip from "./tooltip/tooltip"
 import { Toast } from "./toast/toast"
+import { ConditionalRenderer } from "./conditional-renderer"
 import {
+  conditionalRenderer,
   form,
   formatMessage,
   formCheckboxInput,
@@ -56,4 +58,5 @@ export const interactive = {
   [tooltipContent.key]: Tooltip.Content,
   [formatMessage.key]: FormatMessage,
   [toast.key]: Toast,
+  [conditionalRenderer.key]: ConditionalRenderer,
 }

libs/generic-view/ui/src/lib/interactive/modal/helpers/modal-title-icon.tsx

@@ -14,6 +14,7 @@ export const ModalTitleIcon: APIFC<undefined, ModalTitleIconConfig> = ({
   children,
   ...rest
 }) => {
+  // @ts-ignore
   return <TitleIcon config={config} {...rest} />
 }