Merge branch 'main' into PRO-6684-filter-a11y

apostrophecms · Nov 22, 2024 · aae9fc6 · aae9fc6
2 parents 841228e + d3fd291
commit aae9fc6
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## UNRELEASED
+## 4.10.0 (2024-11-20)
 
 ### Fixes
 
@@ -15,6 +15,8 @@ did not actually use any noncompliant cookie names or values, so there was no vu
 * Rich text "Styles" toolbar now has visually focused state.
 * The `renderPermalinks` and `renderImages` methods of the `@apostrophecms/rich-text` module now correctly resolve the final URLs of page links and inline images in rich text widgets, even when the user has editing privileges. Formerly this was mistakenly prevented by logic intended to preserve the editing experience. The editing experience never actually relied on the
 rendered output.
+* Search bar will perform the search even if the bar is empty allowing to reset a search.
+* Fixes Color picker being hidden in an inline array schema field, also fixes rgba inputs going off the modal.
 
 ### Adds
 

diff --git a/modules/@apostrophecms/asset/lib/build/internals.js b/modules/@apostrophecms/asset/lib/build/internals.js
@@ -308,9 +308,6 @@ module.exports = (self) => {
         const {
           imports = [], assets = [], dynamicImports = []
         } = files;
-        if (!imports.length) {
-          continue;
-        }
 
         for (const file of [ ...imports, ...dynamicImports, ...assets ]) {
           if (seen[file]) {

diff --git a/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue b/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue
@@ -29,35 +29,35 @@
     <div v-if="!disableFields" class="apos-color__field">
       <!-- rgba -->
       <div class="apos-color__field--double">
-        <EdIn
+        <EditableContent
           label="hex"
           :value="hex"
           @change="inputChange"
         />
       </div>
       <div class="apos-color__field--single">
-        <EdIn
+        <EditableContent
           label="r"
           :value="colors.rgba.r"
           @change="inputChange"
         />
       </div>
       <div class="apos-color__field--single">
-        <EdIn
+        <EditableContent
           label="g"
           :value="colors.rgba.g"
           @change="inputChange"
         />
       </div>
       <div class="apos-color__field--single">
-        <EdIn
+        <EditableContent
           label="b"
           :value="colors.rgba.b"
           @change="inputChange"
         />
       </div>
       <div v-if="!disableAlpha" class="apos-color__field--single">
-        <EdIn
+        <EditableContent
           label="a"
           :value="colors.a"
           :arrow-offset="0.01"
@@ -115,7 +115,7 @@ export default {
     Saturation: saturation,
     Hue: hue,
     Alpha: alpha,
-    EdIn: editableInput,
+    EditableContent: editableInput,
     Checkboard: checkboard
   },
   mixins: [ colorMixin ],

diff --git a/modules/@apostrophecms/color-field/ui/apos/lib/AposColorEditableInput.vue b/modules/@apostrophecms/color-field/ui/apos/lib/AposColorEditableInput.vue
@@ -124,6 +124,7 @@ export default {
 }
 
 .apos-color__input {
+  width: 100%;
   padding: 0;
   border: 0;
   outline: none;

diff --git a/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue b/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue
@@ -427,8 +427,6 @@ export default {
         queryExtras.autocomplete = query;
       } else if ('autocomplete' in this.queryExtras) {
         queryExtras.autocomplete = undefined;
-      } else {
-        return {};
       }
       const { total, ...pieces } = await this.requestData(1, queryExtras);
 

diff --git a/modules/@apostrophecms/schema/ui/apos/components/AposInputArray.vue b/modules/@apostrophecms/schema/ui/apos/components/AposInputArray.vue
@@ -249,7 +249,7 @@
                   />
                 </div>
               </div>
-              <transition name="collapse">
+              <transition name="collapse" :duration="400">
                 <div v-show="item.open" class="apos-input-array-inline-body">
                   <AposSchema
                     :key="item._id"

diff --git a/modules/@apostrophecms/schema/ui/apos/scss/AposInputArray.scss b/modules/@apostrophecms/schema/ui/apos/scss/AposInputArray.scss
@@ -1,6 +1,6 @@
 .apos-schema {
-  padding-top: $spacing-base;
-  padding-bottom: $spacing-base;
+  padding-top: $spacing-base * 2;
+  padding-bottom: $spacing-base * 2;
 }
 
 :deep(.apos-field--array.apos-field--error-duplicate) {
@@ -253,9 +253,7 @@
 }
 
 .apos-input-array-inline-body {
-  overflow: hidden;
   max-height: 999px;
-  padding: $spacing-base 0;
   transition: all 400ms ease;
 
   &.collapse-enter-from,
@@ -265,6 +263,7 @@
 
   &.collapse-enter-active,
   &.collapse-leave-active {
+    overflow: hidden;
     transition: max-height 400ms ease;
   }
 }
@@ -307,7 +306,6 @@
     @include apos-transition();
 
     & {
-      overflow: hidden;
       padding: 0;
       border: 1px solid var(--a-base-9);
       outline: 1px solid transparent;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -149,4 +149,4 @@
   "browserslist": [
     "ie >= 10"
   ]
-}
+}