Merge branch 'master' into tessa/adds-missing-icons

Makefile

@@ -1,4 +1,5 @@
 SHELL:=env PATH=${PATH} /bin/sh
+export DEPRECATED_MODULES=Html,Accessibility,Accessibility.Aria,Accessibility.Key,Accessibility.Landmark,Accessibility.Live,Accessibility.Role,Accessibility.Style,Accessibility.Widget
 
 .PHONY: test
 test: node_modules
@@ -22,10 +23,13 @@ percy-tests:
 tests/deprecated-imports-report.txt: $(shell find src -type f) script/deprecated-imports.py
 	script/deprecated-imports.py report > $@
 
+script/deprecated-imports.csv: $(shell find src -type f) script/deprecated-imports.py
+	script/deprecated-imports.py --imports-file $@ update 
+
 .PHONY: deprecated-imports-report
 deprecated-imports-report: tests/deprecated-imports-report.txt script/deprecated-imports.py
 	@cat tests/deprecated-imports-report.txt
-	@script/deprecated-imports.py check
+	@script/deprecated-imports.py --check-message-fix-command='make script/deprecated-imports.csv' check
 
 .PHONY: checks
 checks:

elm.json

@@ -3,7 +3,7 @@
     "name": "NoRedInk/noredink-ui",
     "summary": "UI Widgets we use at NRI",
     "license": "BSD-3-Clause",
-    "version": "7.14.2",
+    "version": "7.15.0",
     "exposed-modules": [
         "Nri.Ui",
         "Nri.Ui.Accordion.V1",

script/deprecated-imports.csv

@@ -1,4 +1,9 @@
 filename,name,version
+src/EventExtras.elm,Html,DEPRECATED
+src/Nri/Ui/Tabs/V3.elm,Accessibility.Aria,DEPRECATED
+src/Nri/Ui/Tabs/V3.elm,Accessibility.Key,DEPRECATED
+src/Nri/Ui/Tabs/V3.elm,Accessibility.Role,DEPRECATED
+src/Nri/Ui/Tabs/V3.elm,Accessibility.Widget,DEPRECATED
 src/Nri/Ui/Page/V3.elm,Nri.Ui.Button,5
 src/Nri/Ui/Page/V3.elm,Nri.Ui.Text,2
 src/Nri/Ui/Page/V2.elm,Nri.Ui.Button,5
@@ -16,15 +21,30 @@ src/Nri/Ui/Alert/V3.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Alert/V2.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Alert/V4.elm,Nri.Ui.Icon,3
 src/Nri/Ui/SortableTable/V1.elm,Nri.Ui.Table,4
+src/Nri/Ui/Html/Attributes/Extra.elm,Html,DEPRECATED
+src/Nri/Ui/Button/V9.elm,Html,DEPRECATED
+src/Nri/Ui/Button/V8.elm,Html,DEPRECATED
 src/Nri/Ui/Button/V3.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Button/V5.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Button/V4.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Button/V6.elm,Nri.Ui.Icon,4
 src/Nri/Ui/Button/V7.elm,Nri.Ui.Icon,4
 src/Nri/Ui/SegmentedControl/V6.elm,Nri.Ui.Icon,3
+src/Nri/Ui/Icon/V3.elm,Accessibility.Role,DEPRECATED
+src/Nri/Ui/Icon/V3.elm,Html,DEPRECATED
+src/Nri/Ui/Icon/V5.elm,Accessibility.Role,DEPRECATED
+src/Nri/Ui/Icon/V5.elm,Html,DEPRECATED
+src/Nri/Ui/Icon/V4.elm,Accessibility.Role,DEPRECATED
+src/Nri/Ui/Icon/V4.elm,Html,DEPRECATED
 src/Nri/Ui/Modal/V3.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Modal/V5.elm,Nri.Ui.Modal,5
+src/Nri/Ui/Modal/V5.elm,Accessibility.Style,DEPRECATED
+src/Nri/Ui/Modal/V5.elm,Html,DEPRECATED
 src/Nri/Ui/Modal/V4.elm,Nri.Ui.Icon,3
 src/Nri/Ui/Modal/V6.elm,Nri.Ui.Modal,6
+src/Nri/Ui/Modal/V6.elm,Accessibility.Style,DEPRECATED
+src/Nri/Ui/Modal/V6.elm,Html,DEPRECATED
 src/Nri/Ui/Modal/V7.elm,Nri.Ui.Modal,7
+src/Nri/Ui/Modal/V7.elm,Accessibility.Style,DEPRECATED
+src/Nri/Ui/Modal/V7.elm,Html,DEPRECATED
 src/Nri/Ui/ClickableText/V1.elm,Nri.Ui.Icon,4

script/deprecated-imports.py

@@ -60,10 +60,15 @@ class NriUiModules:
 
 class Import:
     """a single import."""
+    DEPRECATED = "DEPRECATED"
+
     def __init__(self, filename, name, version):
         self.filename = filename
         self.name = name
-        self.version = int(version)
+        try:
+            self.version = int(version)
+        except ValueError:  # DEPRECATED
+            self.version = self.DEPRECATED
 
     def to_dict(self):
         return {"filename": self.filename, "name": self.name, "version": self.version}
@@ -359,7 +364,7 @@ def parser():
         '--deprecate',
         help="explicitly deprecate a module by name",
         action="append",
-        default=[],
+        default=[m for m in os.environ.get("DEPRECATED_MODULES", "").split(",") if m],
     )
 
     sub = out.add_subparsers()

src/Nri/Ui/Tooltip/V1.elm

@@ -455,6 +455,7 @@ eventsForTrigger trigger msg =
             , Events.onMouseLeave (msg False)
             , Events.onFocus (msg True)
             , Events.onBlur (msg False)
+            , EventExtras.onClickStopPropagation (msg True)
             ]
 
 
@@ -552,6 +553,7 @@ buttonStyleOverrides =
     , Css.color Css.inherit
     , Css.margin Css.zero
     , Css.padding Css.zero
+    , Css.textAlign Css.left
     ]