Merge pull request #256 from citizennet/wenbo/FBCM-5217/bugfix-disabl…

…ed-typeahead FBCM-5217 [Bugfix] Disabled Typeahead Still Allows Changing Selection
citizennet · Jan 19, 2023 · 22bc010 · 22bc010
2 parents 9be2271 + 1374c0b
commit 22bc010
Show file tree

Hide file tree

Showing 66 changed files with 3,130 additions and 3,086 deletions.
diff --git a/.tidyrc.json b/.tidyrc.json
@@ -0,0 +1,10 @@
+{
+  "importSort": "ide",
+  "importWrap": "source",
+  "indent": 2,
+  "operatorsFile": null,
+  "ribbon": 1,
+  "typeArrowPlacement": "last",
+  "unicode": "never",
+  "width": null
+}
diff --git a/Makefile b/Makefile
@@ -17,11 +17,19 @@ FIND_SRC_FILES_ARGS := -name '*.purs' -type f
 NODE_MODULES := $(ROOT_DIR)/node_modules/.stamp
 PACKAGE_JSON := $(ROOT_DIR)/package.json
 PSA_ARGS ?= --censor-lib --stash=$(BUILD_DIR)/.psa_stash --is-lib=.spago --strict --censor-codes=UserDefinedWarning
+PURS_TIDY ?= purs-tidy
 SRC_FILES := $(shell find $(SRC_DIR) $(FIND_SRC_FILES_ARGS))
 TEST_FILES := $(shell find $(TEST_DIR) $(FIND_SRC_FILES_ARGS))
 UI_GUIDE_FILES := $(shell find $(UI_GUIDE_DIR) $(FIND_SRC_FILES_ARGS))
 YARN_LOCK := $(ROOT_DIR)/yarn.lock
 
+FORMAT_SRC_PURS_TIDY_STAMP := $(BUILD_DIR)/.format-src-purs-tidy-stamp
+FORMAT_TEST_PURS_TIDY_STAMP := $(BUILD_DIR)/.format-test-purs-tidy-stamp
+
+FORMAT_DEPENDENCIES := \
+	$(FORMAT_SRC_PURS_TIDY_STAMP) \
+	$(FORMAT_TEST_PURS_TIDY_STAMP)
+
 # Colors for printing
 CYAN := \033[0;36m
 RESET := \033[0;0m
@@ -72,6 +80,14 @@ $(DIST_DIR)/bundled.js: $(OUTPUT_DIR)/Main/index.js
 $(DIST_DIR)/index.js: $(OUTPUT_DIR)/Main/index.js
 	$(NPX) browserify dist/main.js --outfile $@
 
+$(FORMAT_SRC_PURS_TIDY_STAMP): $(SRC_FILES) $(NODE_MODULES_STAMP) | $(BUILD)
+	$(PURS_TIDY) $(PURS_TIDY_CMD) $(SRC_DIR)
+	@touch $@
+
+$(FORMAT_TEST_PURS_TIDY_STAMP): $(TEST_FILES) $(NODE_MODULES_STAMP) | $(BUILD)
+	$(PURS_TIDY) $(PURS_TIDY_CMD) $(TEST_DIR)
+	@touch $@
+
 $(NODE_MODULES): $(PACKAGE_JSON) $(YARN_LOCK)
 	$(NPX) yarn install
 	touch $@
@@ -88,6 +104,18 @@ build: $(BUILD_DEPS) ## Build everything — all the CSS, and the UI Guide — i
 .PHONY: build-ui
 build-ui: $(DIST_DIR)/index.js ## Build the UI Guide, installing any missing dependencies along the way
 
+.PHONY: check-format
+check-format: PURS_TIDY_CMD=check
+check-format: $(FORMAT_DEPENDENCIES) ## Validate formatting of all code
+
+.PHONY: check-format-src
+check-format-src: PURS_TIDY_CMD=check
+check-format-src: $(FORMAT_SRC_PURS_TIDY_STAMP) ## Validate formatting of the `src` directory
+
+.PHONY: check-format-test
+check-format-test: PURS_TIDY_CMD=check
+check-format-test: $(FORMAT_TEST_PURS_TIDY_STAMP) ## Validate formatting of the `test` directory
+
 .PHONY: clean
 clean: $(CLEAN_DEPS) ## Remove all dependencies and build artifacts, starting with a clean slate
 	rm -fr \
@@ -98,6 +126,18 @@ clean: $(CLEAN_DEPS) ## Remove all dependencies and build artifacts, starting wi
 		$(ROOT_DIR)/.spago \
 		$(ROOT_DIR)/node_modules
 
+.PHONY: format
+format: PURS_TIDY_CMD=format-in-place
+format: $(FORMAT_DEPENDENCIES) ## Format all code
+
+.PHONY: format-src
+format-src: PURS_TIDY_CMD=format-in-place
+format-src: $(FORMAT_SRC_PURS_TIDY_STAMP) ## Format the `src` directory
+
+.PHONY: format-test
+format-test: PURS_TIDY_CMD=format-in-place
+format-test: $(FORMAT_TEST_PURS_TIDY_STAMP) ## Format the `test` directory
+
 .PHONY: help
 help: $(BUILD_DIR)/help ## Display this help message
 	@awk 'BEGIN {FS = ":.*?## "}; {printf "$(CYAN)%-30s$(RESET) %s\n", $$1, $$2}' $<

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-ocelot",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "private": true,
   "scripts": {
     "build-all": "make build",
@@ -12,8 +12,9 @@
   "devDependencies": {
     "browserify": "^16.5.1",
     "parcel": "2.2.1",
-    "purescript": "0.14.4",
+    "purescript": "0.14.9",
     "purescript-psa": "0.8.2",
+    "purs-tidy": "0.9.2",
     "spago": "0.20.3",
     "yarn-audit-fix": "^9.0.9"
   },
@@ -25,4 +26,4 @@
   "alias": {
     "xhr2": false
   }
-}
+}
diff --git a/src/Blocks/Badge.purs b/src/Blocks/Badge.purs
@@ -27,63 +27,63 @@ baseClasses = HH.ClassName <$>
 badgeClasses :: Array HH.ClassName
 badgeClasses = baseClasses <>
   ( HH.ClassName <$>
-    [ "w-8"
-    , "h-8"
-    ]
+      [ "w-8"
+      , "h-8"
+      ]
   )
 
-badge
-  :: ∀ p i
-   . Array (IProp HTMLspan i)
-  -> Array (HTML p i)
-  -> HTML p i
+badge ::
+  forall p i.
+  Array (IProp HTMLspan i) ->
+  Array (HTML p i) ->
+  HTML p i
 badge = blockBuilder HH.span badgeClasses
 
-badge_
-  :: ∀ p i
-   . Array (HTML p i)
-  -> HTML p i
+badge_ ::
+  forall p i.
+  Array (HTML p i) ->
+  HTML p i
 badge_ = badge []
 
 badgeSmallClasses :: Array HH.ClassName
 badgeSmallClasses = baseClasses <>
   ( HH.ClassName <$>
-    [ "w-6"
-    , "h-6"
-    , "text-sm"
-    ]
+      [ "w-6"
+      , "h-6"
+      , "text-sm"
+      ]
   )
 
-badgeSmall
-  :: ∀ p i
-   . Array (IProp HTMLspan i)
-  -> Array (HTML p i)
-  -> HTML p i
+badgeSmall ::
+  forall p i.
+  Array (IProp HTMLspan i) ->
+  Array (HTML p i) ->
+  HTML p i
 badgeSmall = blockBuilder HH.span badgeSmallClasses
 
-badgeSmall_
-  :: ∀ p i
-   . Array (HTML p i)
-  -> HTML p i
+badgeSmall_ ::
+  forall p i.
+  Array (HTML p i) ->
+  HTML p i
 badgeSmall_ = badgeSmall []
 
 badgeLargeClasses :: Array HH.ClassName
 badgeLargeClasses = baseClasses <>
   ( HH.ClassName <$>
-    [ "w-12"
-    , "h-12"
-    ]
+      [ "w-12"
+      , "h-12"
+      ]
   )
 
-badgeLarge
-  :: ∀ p i
-   . Array (IProp HTMLspan i)
-  -> Array (HTML p i)
-  -> HTML p i
+badgeLarge ::
+  forall p i.
+  Array (IProp HTMLspan i) ->
+  Array (HTML p i) ->
+  HTML p i
 badgeLarge = blockBuilder HH.span badgeLargeClasses
 
-badgeLarge_
-  :: ∀ p i
-   . Array (HTML p i)
-  -> HTML p i
+badgeLarge_ ::
+  forall p i.
+  Array (HTML p i) ->
+  HTML p i
 badgeLarge_ = badgeLarge []
diff --git a/src/Blocks/Builder.purs b/src/Blocks/Builder.purs
@@ -6,15 +6,15 @@ import Halogen.HTML as HH
 import Halogen.HTML.Properties as HP
 import Ocelot.HTML.Properties (IProp, (<&>))
 
-blockBuilder
-  :: ∀ r p i
-   . ( Array (IProp r i)
-       -> Array (HH.HTML p i)
-       -> HH.HTML p i
-     )
-  -> Array HH.ClassName
-  -> Array (IProp r i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+blockBuilder ::
+  forall r p i.
+  ( Array (IProp r i) ->
+    Array (HH.HTML p i) ->
+    HH.HTML p i
+  ) ->
+  Array HH.ClassName ->
+  Array (IProp r i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 blockBuilder elem classes iprops =
   elem $ [ HP.classes classes ] <&> iprops
diff --git a/src/Blocks/Card.purs b/src/Blocks/Card.purs
@@ -20,47 +20,46 @@ innerCardClasses = HH.ClassName <$>
   [ "m-6"
   ]
 
-baseCard
-  :: ∀ p i
-   . Array (HH.IProp HTMLdiv i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+baseCard ::
+  forall p i.
+  Array (HH.IProp HTMLdiv i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 baseCard iprops =
   HH.div
-    ( [ HP.classes baseCardClasses ] <&> iprops )
+    ([ HP.classes baseCardClasses ] <&> iprops)
 
-baseCard_
-  :: ∀ p i
-   . Array (HH.HTML p i)
-  -> HH.HTML p i
+baseCard_ ::
+  forall p i.
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 baseCard_ = baseCard []
 
-
-innerCard
-  :: ∀ p i
-   . Array (HH.IProp HTMLdiv i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+innerCard ::
+  forall p i.
+  Array (HH.IProp HTMLdiv i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 innerCard iprops =
   HH.div
-    ( [ HP.classes innerCardClasses ] <&> iprops )
+    ([ HP.classes innerCardClasses ] <&> iprops)
 
-innerCard_
-  :: ∀ p i
-   . Array (HH.HTML p i)
-  -> HH.HTML p i
+innerCard_ ::
+  forall p i.
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 innerCard_ = innerCard []
 
-card
-  :: ∀ p i
-   . Array (HH.IProp HTMLdiv i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+card ::
+  forall p i.
+  Array (HH.IProp HTMLdiv i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 card iprops html =
   baseCard iprops [ innerCard_ html ]
 
-card_
-  :: ∀ p i
-   . Array (HH.HTML p i)
-  -> HH.HTML p i
+card_ ::
+  forall p i.
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 card_ = card []
diff --git a/src/Blocks/Checkbox.purs b/src/Blocks/Checkbox.purs
@@ -73,28 +73,28 @@ checkboxClasses = HH.ClassName <$>
   , "after:shadow"
   ]
 
-checkbox
-  :: ∀ p i
-   . Array (HH.IProp HTMLlabel i)
-  -> Array (HH.IProp HTMLinput i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+checkbox ::
+  forall p i.
+  Array (HH.IProp HTMLlabel i) ->
+  Array (HH.IProp HTMLinput i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 checkbox iprops inprops html =
   HH.label
-    ( [ HP.classes labelClasses ] <&> iprops )
+    ([ HP.classes labelClasses ] <&> iprops)
     ( [ HH.input
-        ( [ HP.classes inputClasses
-          , HP.type_ InputCheckbox
-          ] <&> inprops
-        )
+          ( [ HP.classes inputClasses
+            , HP.type_ InputCheckbox
+            ] <&> inprops
+          )
       , HH.span [ HP.classes checkboxClasses ] []
       ]
-      <> html
+        <> html
     )
 
-checkbox_
-  :: ∀ p i
-   . Array (HH.IProp HTMLinput i)
-  -> Array (HH.HTML p i)
-  -> HH.HTML p i
+checkbox_ ::
+  forall p i.
+  Array (HH.IProp HTMLinput i) ->
+  Array (HH.HTML p i) ->
+  HH.HTML p i
 checkbox_ = checkbox []