adj translator typing for react; boolean convert cleanup;

ui-schema · Sep 29, 2023 · a1c78f8 · a1c78f8
1 parent 3e31609
commit a1c78f8
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 15 deletions.
diff --git a/packages/demo-web/package.json b/packages/demo-web/package.json
@@ -27,6 +27,7 @@
         "@ui-schema/pro": "~0.0.12",
         "@ui-schema/material-pickers": "~0.4.0-alpha.4",
         "@tactic-ui/react": "~0.0.10",
+        "@tactic-ui/engine": "~0.0.5",
         "bootstrap": "^4.4.1",
         "clsx": "^1.1.0",
         "immutable": "^4.0.0",

diff --git a/packages/demo-web/src/material-ui/material-ui.tsx b/packages/demo-web/src/material-ui/material-ui.tsx
@@ -28,7 +28,8 @@ import { WidgetProps } from '@ui-schema/react/Widgets'
 import { ObjectRenderer } from '@ui-schema/react-json-schema/ObjectRenderer'
 import { StoreKeys } from '@ui-schema/system/ValueStore'
 import { DecoratorPropsNext, ReactDeco } from '@tactic-ui/react/Deco'
-import { LeafsRenderMapping } from '@tactic-ui/react/LeafsEngine'
+// todo: somehow here the re-export from `@tactic-ui/react/LeafsEngine` doesn't resolve in IntelliJ if engine isn't installed directly
+import { LeafsRenderMapping } from '@tactic-ui/engine/Leaf'
 import { ExtractStorePlugin } from '@ui-schema/react/ExtractStorePlugin'
 import { MuiComponentsBinding, NextMuiWidgetsBinding } from '@ui-schema/ds-material/WidgetsBinding'
 import { SchemaPluginsAdapter } from '@ui-schema/react/SchemaPluginsAdapter'

diff --git a/packages/demo-web/src/t.tsx b/packages/demo-web/src/t.tsx
@@ -42,8 +42,7 @@ const dicEN = createMap({
     titles: {
         'simple-number': 'Simple Number',
     },
-    // todo: fix typings
-}) as unknown as TranslatorDictionary
+}) as TranslatorDictionary<translation | React.ComponentType>
 
 const dicDE = createMap({
     error: de.errors,
@@ -67,8 +66,7 @@ const dicDE = createMap({
     titles: {
         'simple-number': 'Einfache Nummer',
     },
-    // todo: fix typings
-}) as unknown as TranslatorDictionary
+}) as TranslatorDictionary<translation | React.ComponentType>
 
 const tEN = makeTranslator<translation | React.ComponentType>(dicEN, 'en')
 const tDE = makeTranslator<translation | React.ComponentType>(dicDE, 'de')

diff --git a/packages/docs/src/component/Schema/DemoUIGenerator.js b/packages/docs/src/component/Schema/DemoUIGenerator.js
@@ -186,7 +186,7 @@ const DemoUIGenerator = (
             onClick ?
                 <Button
                     variant={'contained'}
-                    disabled={!!isInvalid(store?.getValidity())}
+                    disabled={Boolean(isInvalid(store?.getValidity()))}
                     style={{marginTop: 12}}
                     onClick={() => isInvalid(store?.getValidity()) ? undefined : onClick(store)}
                 >Send</Button> : null}

diff --git a/packages/docs/src/page/PageQuickStart.js b/packages/docs/src/page/PageQuickStart.js
@@ -410,7 +410,7 @@ export const Generator = () => {
 
             {/* add your sending button, in the onClick check for validity and do the needed action */}
             <button
-                disabled={!!isInvalid(store.getValidity())}
+                disabled={Boolean(isInvalid(store.getValidity()))}
                 onClick={() => {
                     if(!isInvalid(store.getValidity())) {
                         // when not invalid, post to an API
@@ -574,7 +574,7 @@ export const Generator = () => {
 
             {/* add your sending button, in the onClick check for validity and do the needed action */}
             <button
-                disabled={!!isInvalid(store.getValidity())}
+                disabled={Boolean(isInvalid(store.getValidity()))}
                 onClick={() => {
                     if(!isInvalid(store.getValidity())) {
                         // when not invalid, post to an API

diff --git a/packages/ds-bootstrap/src/Widgets/OptionsBoolean/OptionsBoolean.js b/packages/ds-bootstrap/src/Widgets/OptionsBoolean/OptionsBoolean.js
@@ -15,12 +15,10 @@ const BoolRenderer = ({showValidity, required, errors, value, storeKeys, onChang
         classForm.push('was-validated');
     }
 
-    let currentChecked = !!value;
-
     return <div className={classForm.join(' ')}>
         <input
             type="checkbox" className={classFormControl.join(' ')} id={'uis-' + id}
-            checked={currentChecked}
+            checked={Boolean(value)}
             required={required}
             onChange={() =>
                 onChange({

diff --git a/packages/uis-react/package.json b/packages/uis-react/package.json
@@ -40,6 +40,7 @@
         "@tactic-ui/react": "~0.0.10"
     },
     "devDependencies": {
+        "@tactic-ui/engine": "~0.0.5",
         "@ui-schema/system": "~0.5.0-alpha.0",
         "@ui-schema/json-schema": "~0.5.0-alpha.0",
         "immutable": "^4.0.0",

diff --git a/packages/uis-react/src/WidgetEngine/WidgetEngine.tsx b/packages/uis-react/src/WidgetEngine/WidgetEngine.tsx
@@ -1,6 +1,7 @@
 import { ReactDeco, DecoratorProps, ReactBaseDecorator } from '@tactic-ui/react/Deco'
 import React from 'react'
 import { createLeafsContext, defineLeafsContext } from '@tactic-ui/react/LeafsContext'
+// todo: somehow here the re-export from `@tactic-ui/react/LeafsEngine` doesn't resolve in IntelliJ if engine isn't installed directly
 import { LeafsRenderMapping, ReactLeafsNodeSpec } from '@tactic-ui/react/LeafsEngine'
 import { WidgetProps } from '@ui-schema/react/Widgets'
 import { UISchemaMap } from '@ui-schema/json-schema/Definitions'

diff --git a/packages/uis-system/src/Translator/Translator.ts b/packages/uis-system/src/Translator/Translator.ts
@@ -11,5 +11,4 @@ export type Translator<T = translation> = (
     schema?: ValueOrImmutableOrdered<UISchema['t']>
 ) => T
 
-// @todo: somehow allow adding further specifics, e.g. `React.ComponentType` in `/react`
-export type TranslatorDictionary = Map<string | number, Map<string | number, { [key: string | number]: any }> | string | number | Function/* | React.ComponentType*/>
+export type TranslatorDictionary<T = translation> = Map<string | number, Map<string | number, { [key: string | number]: any }> | T>
diff --git a/packages/uis-system/src/Translator/makeTranslator.ts b/packages/uis-system/src/Translator/makeTranslator.ts
@@ -11,7 +11,7 @@ import { translation, Translator, TranslatorDictionary } from '@ui-schema/system
  */
 export const makeTranslator =
     <T = translation>(
-        dictionary: TranslatorDictionary,
+        dictionary: TranslatorDictionary<T>,
         locale: string = ''
     ): Translator<T> =>
         (text, context = Map(), schema = undefined) => {

diff --git a/packages/uis-system/src/ValidatorErrors/ValidatorErrors.ts b/packages/uis-system/src/ValidatorErrors/ValidatorErrors.ts
@@ -87,7 +87,7 @@ export class ValidatorErrors extends Record({
 
     hasError(type?: string): boolean {
         const typeErrors = this.getIn(type ? ['errors', type] : ['errors'])
-        return !!(
+        return Boolean(
             (List.isList(typeErrors) && typeErrors.size) ||
             (Map.isMap(typeErrors) && typeErrors.keySeq().size)
         )