[upd] Add text layout class constant; Add category to ts definitions

kbss-cvut · Oct 8, 2020 · 2ba8a3d · 2ba8a3d
1 parent 10fe652
commit 2ba8a3d
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/css/s-forms.min.css b/css/s-forms.min.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/constants/Constants.js b/src/constants/Constants.js
@@ -24,6 +24,7 @@ export const LAYOUT = {
   DATE: 'date',
   TIME: 'time',
   DATETIME: 'datetime',
+  TEXT: 'text',
   TEXTAREA: 'textarea',
   CHECKBOX: 'checkbox',
   QUESTION_TYPEAHEAD: 'type-ahead',
@@ -35,13 +36,7 @@ export const LAYOUT = {
   HIDDEN: 'hidden',
   COLLAPSED: 'collapsed',
   EMPHASISED: 'emphasised',
-  CATEGORY: [
-    'category-1',
-    'category-2',
-    'category-3',
-    'category-4',
-    'category-5'
-  ]
+  CATEGORY: ['category-1', 'category-2', 'category-3', 'category-4', 'category-5']
 };
 export const VALUE_TYPE_CODE = 'code';
 export const VALUE_TYPE_TEXT = 'text';

diff --git a/src/util/FormUtils.js b/src/util/FormUtils.js
@@ -46,6 +46,10 @@ export default class FormUtils {
     );
   }
 
+  static isText(question) {
+    return JsonLdUtils.hasValue(question, Constants.LAYOUT_CLASS, Constants.LAYOUT.TEXT);
+  }
+
   static isCalendar(question) {
     return FormUtils.isDate(question) || FormUtils.isTime(question) || FormUtils.isDateTime(question);
   }
@@ -87,9 +91,7 @@ export default class FormUtils {
   }
 
   static getCategory(question) {
-    return Constants.LAYOUT.CATEGORY.find(
-        c => JsonLdUtils.hasValue(question, Constants.LAYOUT_CLASS, c)
-    );
+    return Constants.LAYOUT.CATEGORY.find((c) => JsonLdUtils.hasValue(question, Constants.LAYOUT_CLASS, c));
   }
 
   static resolveValue(answer) {

diff --git a/types/s-forms.d.ts b/types/s-forms.d.ts
@@ -46,6 +46,12 @@ export interface SFormsProps {
   loader?: React.ElementType; // default <div>Loading SForms...</div>
 }
 
+type ArrayLengthMutationKeys = 'category-1' | 'category-2' | 'category-3' | 'category-4' | 'category-5';
+type ArrayItems<T extends Array<any>> = T extends Array<infer TItems> ? TItems : never;
+type FixedLengthArray<T extends any[]> = Pick<T, Exclude<keyof T, ArrayLengthMutationKeys>> & {
+  [Symbol.iterator]: () => IterableIterator<ArrayItems<T>>;
+};
+
 export module Constants {
   const COLUMN_COUNT: unique symbol;
   const INPUT_LENGTH_THRESHOLD: unique symbol;
@@ -67,6 +73,7 @@ export module Constants {
     TIME: string;
     DATETIME: string;
     TEXTAREA: string;
+    TEXT: string;
     CHECKBOX: string;
     QUESTION_TYPEAHEAD: string;
     MASKED_INPUT: string;
@@ -77,6 +84,7 @@ export module Constants {
     DISABLED: string;
     EMPHASISED: string;
     HIDDEN: string;
+    CATEGORY: FixedLengthArray<[string, string, string, string, string]>;
   };
   const VALUE_TYPE_CODE: unique symbol;
   const VALUE_TYPE_TEXT: unique symbol;
@@ -160,6 +168,7 @@ export class FormUtils {
   static isDisabled(question): boolean;
   static isHidden(question): boolean;
   static isTextarea(question, answerValue): boolean;
+  static isText(question): boolean;
   static isCalendar(question): boolean;
   static isDate(question): boolean;
   static isTime(question): boolean;
@@ -169,6 +178,7 @@ export class FormUtils {
   static isSparqlInput(question): boolean;
   static isTurtleInput(question): boolean;
   static isCollapsed(question): boolean;
+  static getCategory(question): string;
   static isEmphasised(question): boolean;
   static resolveValue(answer): any;
   static resolveValueObject(answer): any;