Merge pull request #1350 from plone/5.1.x-backports

Backporting minor bugs [5.1.x]
plone · Oct 24, 2023 · d8e5162 · d8e5162
2 parents 314e4ce + 1c63030
commit d8e5162
Show file tree

Hide file tree

Showing 6 changed files with 488 additions and 330 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,11 +3,11 @@ on:
   push:
     branches:
     - master
-    - 5.0.x
+    - 5.1.x
   pull_request:
     branches:
     - master
-    - 5.0.x
+    - 5.1.x
 jobs:
   build:
     name: test

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "dependencies": {
         "@11ty/eleventy-upgrade-help": "2",
         "@patternslib/pat-code-editor": "4.0.1",
-        "@patternslib/patternslib": "^9.9.5",
+        "@patternslib/patternslib": "^9.9.8",
         "backbone": "1.4.1",
         "backbone.paginator": "2.0.8",
         "bootstrap": "5.3.2",
@@ -33,34 +33,34 @@
         "datatables.net-select": "1.4.0",
         "datatables.net-select-bs5": "1.4.0",
         "dropzone": "4.3.0",
-        "jqtree": "1.7.0",
-        "jquery": "^3.7.0",
+        "jqtree": "1.7.5",
+        "jquery": "^3.7.1",
         "jquery-form": "4.3.0",
         "jquery.browser": "0.1.0",
         "js-cookie": "^3.0.5",
         "select2": "git+https://github.com/ivaynberg/select2.git#3.5.4",
         "sortablejs": "^1.15.0",
-        "tinymce": "^5.10.7",
-        "tinymce-i18n": "^22.12.27",
+        "tinymce": "^5.10.8",
+        "tinymce-i18n": "^23.10.9",
         "underscore": "^1.13.6"
     },
     "devDependencies": {
         "@11ty/eleventy": "^2.0.1",
         "@11ty/eleventy-navigation": "^0.3.5",
         "@11ty/eleventy-plugin-syntaxhighlight": "^4.2.0",
-        "@patternslib/dev": "^3.5.0",
-        "@types/sinon": "^10.0.14",
+        "@patternslib/dev": "^3.5.2",
+        "@types/sinon": "^10.0.20",
         "npm-run-all": "^4.1.5",
         "rimraf": "^4.1.3",
         "sinon": "^15.2.0"
     },
     "resolutions": {
-        "@patternslib/patternslib": "^9.9.5",
+        "@patternslib/patternslib": "^9.9.8",
         "backbone": "1.4.1",
         "datatables.net": "<1.13",
         "datatables.net-bs5": "<1.13",
-        "jquery": "3.7.0",
-        "nwsapi": "2.2.2",
+        "jquery": "3.7.1",
+        "nwsapi": "2.2.7",
         "underscore": "1.13.6"
     },
     "scripts": {

diff --git a/src/pat/relateditems/relateditems.js b/src/pat/relateditems/relateditems.js
@@ -427,7 +427,6 @@ export default Base.extend({
                             data.push.apply(data, e.results);
                             this.$el.select2("data", data, true);
                             this.emit("selected");
-                            this.popover.hide();
                         },
                         false
                     );

diff --git a/src/pat/relateditems/relateditems.scss b/src/pat/relateditems/relateditems.scss
@@ -4,11 +4,21 @@
     width: 100%;
 
     .select2-container {
+        /* generalize from .form-control */
+        border: var(--bs-border-width) solid var(--bs-border-color);
+        padding: 0.325rem 0.5rem;
         min-width: 100%;
+        border-radius: 0 0 var(--bs-border-radius) var(--bs-border-radius);
+        &.select2-dropdown-open {
+            border-radius:0;
+            border-bottom-style:none;
+        }
     }
 
+
     .toolbar {
         background-color: var(--bs-secondary-bg);
+        border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0 ;
 
         .mode-selector {
             display: inline-block;
@@ -39,6 +49,12 @@
 }
 
 .pat-relateditems-dropdown {
+
+    &.select2-drop-active {
+        border-color: var(--bs-border-color);
+        box-shadow: none;
+    }
+
     .select2-results {
         max-height: 950px;
 
@@ -92,8 +108,18 @@
 
     &.select2-container-multi {
         .select2-choices {
+            border: none;
+            background: none;
+
+            .select2-search-field input {
+                padding:0;
+            }
+
             .select2-search-choice {
                 background-image: none;
+                background-color: var(--bs-gray-100);
+                border-color:var(--bs-border-color);
+                box-shadow: none;
                 margin: 0.2em;
                 padding: 0;
                 // make choices list compact:
@@ -111,6 +137,12 @@
                 }
             }
         }
+
+        &.select2-container-active {
+            .select2-choices {
+                border:none;
+            }
+        }
     }
 }
 

diff --git a/src/pat/relateditems/templates/toolbar.xml b/src/pat/relateditems/templates/toolbar.xml
@@ -38,13 +38,13 @@
 
 <% if (upload) { %>
 <div class="upload dropdown dropdown-menu-end ms-2">
-  <button type="button" class="upload dropdown-toggle btn btn-primary btn-sm" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+  <button type="button" class="upload dropdown-toggle btn btn-primary btn-sm" data-bs-toggle="dropdown" data-bs-auto-close="false" aria-haspopup="true" aria-expanded="false">
     <%= icon_upload %>
     <%- upload_text %>
     <span class="caret"/>
   </button>
-  <ul class="dropdown-menu">
+  <div class="dropdown-menu p-2">
     <div class="pat-upload"></div>
-  </ul>
+  </div>
 </div>
 <% } %>