Clean up merge

SelectQuoteLabs · Feb 1, 2022 · 6d739ec · 6d739ec
1 parent b061453
commit 6d739ec
Show file tree

Hide file tree

Showing 10 changed files with 444 additions and 341 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "nuke-everything": "rm -rf ./dist && rm -rf ./node_modules && rm -f package-lock.json",
     "commit": "npx git-cz",
     "format": "npx prettier --write 'src/**/*.{js,ts,tsx}'",
+    "format.ci": "npx prettier --check './{pages,src}/**/*.{js,ts,tsx}'",
     "docs": "cd SQFormDocs && npm start",
     "build-docs": "cd SQFormDocs && npm ci && npm run build"
   },

diff --git a/src/components/SQForm/SQFormDatePickerWithCalendarInputOnly.tsx b/src/components/SQForm/SQFormDatePickerWithCalendarInputOnly.tsx
@@ -6,7 +6,8 @@ import SQFormDatePicker, {SQFormDatePickerProps} from './SQFormDatePicker';
 import {useForm} from './useForm';
 import type {BaseFieldProps} from 'types';
 
-export interface SQFormDatePickerWithCalendarInputOnlyProps extends BaseFieldProps {
+export interface SQFormDatePickerWithCalendarInputOnlyProps
+  extends BaseFieldProps {
   /** Disabled property to disable the input if true */
   isDisabled?: boolean;
   /** Placeholder text used inside the input field to provide hints to the user */

diff --git a/src/components/SQForm/SQFormMaskedReadOnlyField.js b/src/components/SQForm/SQFormMaskedReadOnlyField.js
diff --git a/src/components/SQForm/SQFormMaskedReadOnlyField.tsx b/src/components/SQForm/SQFormMaskedReadOnlyField.tsx
@@ -10,7 +10,8 @@ interface TextFieldMaskProps extends React.HTMLAttributes<HTMLInputElement> {
   mask?: maskProp;
 }
 
-export interface SQFormMaskedReadOnlyFieldProps extends SQFormReadOnlyFieldProps {
+export interface SQFormMaskedReadOnlyFieldProps
+  extends SQFormReadOnlyFieldProps {
   /** Valid mask array; custom or from utils/masks.js */
   mask?: maskProp;
   /** Placeholder text used inside the input field to provide hints to the user */

diff --git a/src/components/SQForm/SQFormMaskedTextField.js b/src/components/SQForm/SQFormMaskedTextField.js
diff --git a/src/components/SQForm/SQFormReadOnlyField.js b/src/components/SQForm/SQFormReadOnlyField.js
diff --git a/src/components/SQForm/SQFormResetButtonWithConfirmation.tsx b/src/components/SQForm/SQFormResetButtonWithConfirmation.tsx
@@ -27,13 +27,13 @@ function SQFormResetButtonWithConfirmation({
   confirmationContent,
   confirmationTitle = 'Reset Form',
   variant = 'contained',
-  onReset
+  onReset,
 }: SQFormResetButtonWithConfirmationProps): JSX.Element {
   const {isDialogOpen, openDialog, closeDialog} = useDialog();
   const {dirty, handleReset} = useFormButton({
     isDisabled,
     buttonType: BUTTON_TYPES.RESET,
-    shouldRequireFieldUpdates: false
+    shouldRequireFieldUpdates: false,
   });
 
   const handlePrimaryButtonClick = () => {

diff --git a/src/components/SQForm/useFormButton.js b/src/components/SQForm/useFormButton.js