✨ [#2] PR feedback

open-formulieren · Oct 27, 2023 · 6d6d1db · 6d6d1db
1 parent 0a1c0e0
commit 6d6d1db
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/formio/components/currency.ts b/src/formio/components/currency.ts
@@ -1,25 +1,20 @@
-import {InputComponentSchema, MultipleCapable, PrefillConfig} from '..';
+import {InputComponentSchema, MultipleCapable} from '..';
 
 type Validator = 'required' | 'min' | 'max';
-type TranslatableKeys = 'label' | 'description' | 'tooltip' | 'suffix';
+type TranslatableKeys = 'label' | 'description' | 'tooltip';
 
 export type CurrencyInputSchema = InputComponentSchema<number, Validator, TranslatableKeys>;
 
 /**
  * @group Form.io components
  * @category Base types
  */
-export interface BaseCurrencyComponentSchema
-  extends Omit<CurrencyInputSchema, 'hideLabel'>,
-    PrefillConfig {
+export interface BaseCurrencyComponentSchema extends Omit<CurrencyInputSchema, 'hideLabel'> {
   type: 'currency';
   // additional properties
-  currency?: 'EUR';
+  currency: 'EUR';
   decimalLimit?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
   allowNegative?: boolean;
-  // re-add
-  prefix?: string;
-  suffix?: string;
 }
 
 /**

diff --git a/test-d/formio/components/currency.test-d.ts b/test-d/formio/components/currency.test-d.ts
@@ -56,16 +56,6 @@ expectNotAssignable<CurrencyComponentSchema>({
   hideLabel: true,
 } as const);
 
-// no multiple support -> no array defaultValue
-expectNotAssignable<CurrencyComponentSchema>({
-  id: '123',
-  type: 'currency',
-  key: 'aCurrency',
-  label: 'A currency',
-  currency: 'EUR',
-  defaultValue: [],
-} as const);
-
 expectNotAssignable<CurrencyComponentSchema>({
   id: '123',
   type: 'currency',
@@ -139,7 +129,40 @@ expectAssignable<CurrencyComponentSchema>({
   // translations tab in builder form
   openForms: {
     translations: {
-      nl: {suffix: 'foo', tooltip: 'bar'},
+      nl: {tooltip: 'bar'},
     },
   },
-});
+});
+
+// invalid, multiple true and non-array default value
+expectNotAssignable<CurrencyComponentSchema>({
+  id: '123',
+  type: 'currency',
+  key: 'aCurrency',
+  label: 'A currency',
+  currency: 'EUR',
+  multiple: true,
+  defaultValue: 2,
+});
+
+// invalid, multiple false and array default value
+expectNotAssignable<CurrencyComponentSchema>({
+  id: '123',
+  type: 'currency',
+  key: 'aCurrency',
+  label: 'A currency',
+  currency: 'EUR',
+  multiple: false,
+  defaultValue: [1],
+});
+
+// invalid, multiple true and wrong default value in array element
+expectNotAssignable<CurrencyComponentSchema>({
+  id: '123',
+  type: 'currency',
+  key: 'aCurrency',
+  label: 'A currency',
+  currency: 'EUR',
+  multiple: true,
+  defaultValue: ['a string and not a number'],
+});