Merge branch '2.2' into 2

silverstripe · Apr 30, 2024 · a3aa41c · a3aa41c
2 parents d43e6dc + 3434873
commit a3aa41c
Show file tree

Hide file tree

Showing 8 changed files with 350 additions and 947 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1 @@
+client/src/styles/legacy/*
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -0,0 +1 @@
+module.exports = require('@silverstripe/eslint-config/.stylelintrc');
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/TreeDropdownField/TreeDropdownField.js b/client/src/components/TreeDropdownField/TreeDropdownField.js
@@ -604,7 +604,7 @@ class TreeDropdownField extends Component {
           type="button"
           className="treedropdownfield__option-button fill-width"
           onClick={handleNavigate}
-          onMouseDown={handleNavigate}
+          onKeyDown={(event) => this.handleKeyDown(event)}
           onTouchStart={handleNavigate}
         >
           <span className="treedropdownfield__option-count-icon font-icon-right-open-big" />

diff --git a/client/src/legacy/LeftAndMain.js b/client/src/legacy/LeftAndMain.js
@@ -111,7 +111,15 @@ $.entwine('ss', function($) {
     // Determine action
     switch(data.type) {
       case 'event':
-        target.trigger(data.event, data.data);
+        let eventType = data.event;
+        let eventData = data.data;
+        if (!eventType) {
+           eventType = data.message.type;
+        }
+        if (!eventData) {
+          eventData = data.message.payload;
+        }
+        target.trigger(eventType, eventData);
         break;
       case 'callback':
         target[data.callback].call(target, data.data);

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "css": "WEBPACK_CHILD=css npm run build",
     "test": "jest",
     "coverage": "jest --coverage",
-    "lint": "eslint client/src && sass-lint -v",
+    "lint": "eslint client/src && stylelint client/src/**/*.scss",
     "js-fix": "eslint client/src --fix",
     "pattern-lib": "storybook dev -p 6006",
     "static-pattern-lib": "storybook build"
@@ -90,8 +90,8 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.20.0",
-    "@silverstripe/eslint-config": "^1.1.0",
-    "@silverstripe/webpack-config": "^2.0.0",
+    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/webpack-config": "^2.1.0",
     "@storybook/addon-actions": "^7.0.18",
     "@storybook/addon-controls": "^7.0.18",
     "@storybook/addon-essentials": "^7.0.18",