Merge remote-tracking branch 'origin/master' into 35.x

packages/app/package.json

@@ -18,7 +18,7 @@
         "@dhis2/d2-ui-file-menu": "^7.0.5",
         "@dhis2/d2-ui-interpretations": "^7.0.5",
         "@dhis2/data-visualizer-plugin": "35.12.9",
-        "@dhis2/ui": "^5.5.3",
+        "@dhis2/ui": "^5.5.4",
         "@material-ui/icons": "^3.0.1",
         "d2": "31.8.2",
         "history": "^4.7.2",

packages/plugin/package.json

@@ -11,7 +11,7 @@
     },
     "dependencies": {
         "@dhis2/analytics": "^10.0.2",
-        "@dhis2/ui": "^5.5.3",
+        "@dhis2/ui": "^5.5.4",
         "lodash-es": "^4.17.11"
     },
     "peerDependencies": {

yarn.lock

@@ -1578,59 +1578,59 @@
   dependencies:
     prop-types "^15"
 
-"@dhis2/ui-constants@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.5.3.tgz#7abf3af4b7cacceb5908251e33406a0a508a8b6d"
-  integrity sha512-3z3dkZ4LqZkwS9KAf1bmwq18YEJDDJ5QSOzcMuQyE5EDaLDUohBi88WDMdGikcGxAQ7k//BxX/uiYZzSxPDX4w==
+"@dhis2/ui-constants@5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.5.4.tgz#b71b5dc04c28857aea6a7be3e2726a580e0a9e86"
+  integrity sha512-0lUACjGo3WaTVw/O7nrriVHuwcPiJkdFDXj1HZ6Bv0zkpfLR7LgnXsAOI1S0lqQ8lEhPb9n+RnEBHOpMktIAag==
   dependencies:
     "@dhis2/prop-types" "^1.6.4"
 
-"@dhis2/ui-core@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.5.3.tgz#725d331a0a8ba88bd4c3e3e10c374b71a8e0b644"
-  integrity sha512-OdSgwOGlDFLZk+4jmdgvnwQV79vxksf3DMvj5pi9K1tqjJFXcvvwmrk8LC+HUtxPQDoF2L1JK0tJlSIcrC0fRA==
+"@dhis2/ui-core@5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.5.4.tgz#7dcad12bfcf0fac219dfd418c0b940400a41b2f6"
+  integrity sha512-Eu95Geqj5dA5kbyaujOcA6KuwOcJzVTuLQOyhqBfMQm+lrxgrlQieI+yHhJqPSSEYC8ioXriQ6YuamW04yxJKg==
   dependencies:
     "@dhis2/prop-types" "^1.6.4"
     "@popperjs/core" "^2.4.4"
     classnames "^2.2.6"
     react-popper "^2.2.3"
     resize-observer-polyfill "^1.5.1"
 
-"@dhis2/ui-forms@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-5.5.3.tgz#d97bb2fa00ec7f976e50ad339cf1ef2c2582833e"
-  integrity sha512-kPsZJZUmnueJrDJqxKNV4ZzE/3C3ffYDCtvTYQmw1n6IBFRIKccGsrjd8ZFK/1dD3rU17oIIMmO4XzfABl9tdg==
+"@dhis2/ui-forms@5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-5.5.4.tgz#f772ba1feda6c8de3547be71b32c0dc7b93a212b"
+  integrity sha512-7u4bVZpy4rUWI+PQu/AwTDa+2HzCPpnsUsXE7Yryc5ziiNY0LAGT9nqIeBRCGtsRcOpEYOHvMfiPj/HZTcqGlA==
   dependencies:
     "@dhis2/prop-types" "^1.6.4"
     classnames "^2.2.6"
     final-form "^4.20.1"
     react-final-form "^6.5.1"
 
-"@dhis2/ui-icons@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.5.3.tgz#be769d01f0a4acbfbb0ac87975c3c976a8903d36"
-  integrity sha512-B+v1o6sELKiUHn5Sje7uag95umnKruZmRRAtR0HL0ymjjWR2OLVlQJNaPxFr5LiBc71ArdGno/b8yxO7ebsygA==
+"@dhis2/ui-icons@5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.5.4.tgz#b785d79fa74b9da6a8129101744669e0064c5c14"
+  integrity sha512-0epLc4JYqpCRRcRYMOR+ePQxob6uA5AKYEqe2ADt1BL7ghtnATEx6M4sJaQxprEKXgAvl3VIx7g2MepGVAWZCg==
   dependencies:
     "@dhis2/prop-types" "^1.6.4"
 
-"@dhis2/ui-widgets@5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.5.3.tgz#30b07d493f43640a5c7d18b728ca716b6ca3db7b"
-  integrity sha512-bjHpGzvWVZcOPQepx8vb2H614aRMGvfg6iiDmQEE/WLWKxw835tJKzTNkqyJY1z1kjkxlggORNBt2n66GaflIg==
+"@dhis2/ui-widgets@5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.5.4.tgz#5aa1b8baf5dec081f50758b7dd889c628ee0e482"
+  integrity sha512-ktsscavQEz6ko2tBqOPOHMiQU7cAAv2m/5rT95bgPNDQYtj78C9d/7m8JeecnafkkZjt8rgxYKx/CKHVaxbGoQ==
   dependencies:
     "@dhis2/prop-types" "^1.6.4"
     classnames "^2.2.6"
 
-"@dhis2/ui@^5.4.2", "@dhis2/ui@^5.5.3":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-5.5.3.tgz#b96aa3edbc937255657244289a0e43586f579eaa"
-  integrity sha512-qmfWolFBl+IIXBkGYFn7eJ5xSYLhZE5GHHio718i2aoziXvrBdqoTR8Yy+eD5jHFyso8owiy+b8vOrZdN3dL3w==
+"@dhis2/ui@^5.4.2", "@dhis2/ui@^5.5.3", "@dhis2/ui@^5.5.4":
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-5.5.4.tgz#c82bde44e5d21160018ef5da0e427423a526b296"
+  integrity sha512-h1Kl/4aIdFqVxcVlICvfgKQtVrQPxvz1xGq36hfwZxPc8Z9A4SqUDz5vUi9tP4LxNUWJSOEm33LLFEJiqqDT3Q==
   dependencies:
-    "@dhis2/ui-constants" "5.5.3"
-    "@dhis2/ui-core" "5.5.3"
-    "@dhis2/ui-forms" "5.5.3"
-    "@dhis2/ui-icons" "5.5.3"
-    "@dhis2/ui-widgets" "5.5.3"
+    "@dhis2/ui-constants" "5.5.4"
+    "@dhis2/ui-core" "5.5.4"
+    "@dhis2/ui-forms" "5.5.4"
+    "@dhis2/ui-icons" "5.5.4"
+    "@dhis2/ui-widgets" "5.5.4"
 
 "@emotion/babel-utils@^0.6.4":
   version "0.6.10"