RubyGems - decidim-core - Versions diffs - 0.31.5 → 0.32.0.rc2 - Mend

decidim-core 0.31.5 → 0.32.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (361) hide show

data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js CHANGED Viewed

@@ -5,13 +5,17 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
   describe("orderedList", () => {
     it("creates a new ordered list", async () => {
       await setContent("Hello, world!");
       ctx.prosemirror.focus();
       getControl("orderedList").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<ol><li><p>Hello, world!</p></li></ol>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<ol><li><p>Hello, world!</p></li></ol>");
     });
     it("makes existing ordered list as normal text", async () => {
@@ -21,7 +25,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ol li p");
       getControl("orderedList").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
@@ -31,7 +35,7 @@ export default (ctx) => {
       ctx.prosemirror.focus();
       getControl("bulletList").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<ul><li><p>Hello, world!</p></li></ul>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<ul><li><p>Hello, world!</p></li></ul>");
     });
     it("makes existing bullet list as normal text", async () => {
@@ -41,7 +45,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ul li p");
       getControl("bulletList").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 };

data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js CHANGED Viewed

@@ -5,13 +5,17 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
   describe("bold", () => {
     it("makes text bold", async () => {
       await setContent("Hello, world!");
       selectContent(ctx.prosemirror);
       getControl("bold").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><strong>Hello, world!</strong></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><strong>Hello, world!</strong></p>");
     });
     it("makes already bolded text normal", async () => {
@@ -20,7 +24,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p strong");
       getControl("bold").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
@@ -30,7 +34,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror);
       getControl("italic").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><em>Hello, world!</em></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><em>Hello, world!</em></p>");
     });
     it("makes already italic text normal", async () => {
@@ -39,7 +43,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p em");
       getControl("italic").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
@@ -49,7 +53,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror);
       getControl("underline").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><u>Hello, world!</u></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><u>Hello, world!</u></p>");
     });
     it("makes already underlined text normal", async () => {
@@ -58,7 +62,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p u");
       getControl("underline").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
@@ -71,7 +75,7 @@ export default (ctx) => {
       getControl("common:eraseStyles").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
     it("makes ordered list content as normal text", async () => {
@@ -80,7 +84,7 @@ export default (ctx) => {
       getControl("common:eraseStyles").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
     it("makes bullet list content as normal text", async () => {
@@ -89,7 +93,7 @@ export default (ctx) => {
       getControl("common:eraseStyles").click();
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
   });
 };

data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js CHANGED Viewed

@@ -5,6 +5,10 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
   describe("heading", () => {
     const levels = ["2", "3", "4", "5", "6"];
     let selectValue = (value) => {
@@ -21,7 +25,7 @@ export default (ctx) => {
         selectValue(level);
         const tag = `h${level}`;
-        expect(ctx.prosemirror.innerHTML).toEqual(`<${tag}>Hello, world!</${tag}>`);
+        expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(`<${tag}>Hello, world!</${tag}>`);
       });
     });
@@ -33,7 +37,7 @@ export default (ctx) => {
         selectValue("normal");
-        expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+        expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
       });
     });
   });

data/app/packs/src/decidim/index.js CHANGED Viewed

@@ -36,7 +36,6 @@ import "src/decidim/results_listing"
 import "src/decidim/data_consent"
 import "src/decidim/sw"
 import "src/decidim/attachments"
-import "src/decidim/dropdown_menu"
 import "src/decidim/callout"
 // local deps that require initialization

data/app/packs/stylesheets/decidim/_cards.scss CHANGED Viewed

@@ -175,7 +175,8 @@
   /* shared styles */
   &__highlight-metadata,
   &__grid-metadata {
-    @apply mt-auto flex items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:flex-none;
+    @apply mt-auto flex gap-x-2 items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center
+    [&>*]:gap-1 first:[&>*]:flex-none;
     svg {
       @apply flex-none text-gray fill-current;

data/app/packs/stylesheets/decidim/_datepicker.scss CHANGED Viewed

@@ -102,14 +102,6 @@
     @apply absolute z-30 bottom-2 right-1;
   }
-  &__pick-calendar {
-    @apply absolute z-30 bottom-2 right-16 mr-1;
-    &:disabled {
-      @apply bg-gray;
-    }
-  }
   &__close-clock {
     @apply absolute z-30 bottom-2 right-1;
   }

data/app/packs/stylesheets/decidim/_dropdown.scss CHANGED Viewed

@@ -33,47 +33,37 @@
   }
 }
-[data-target="dropdown-menu-participatory-space"],
-[data-target="dropdown-menu-order"],
-[data-target="dropdown-menu-resource"],
-[data-target="dropdown-menu-sidebar"] {
-  @apply md:hidden;
-}
-[data-target="dropdown-menu-language-chooser"] {
-  & > span {
-    @apply block font-semibold text-black text-xs;
-  }
-  > svg {
-    @apply w-5 h-6 flex-none text-xs font-normal text-black fill-current;
+[data-target="dropdown-menu-main-mobile"] {
+  &[aria-expanded="false"] > span:last-of-type,
+  &[aria-expanded="true"] > span:first-of-type {
+    @apply hidden;
   }
-  & > ul {
-    @apply w-6 bg-gray;
-    > li {
-      @apply w-6 bg-gray;
-    }
+  &[aria-expanded="true"] > span:last-of-type,
+  &[aria-expanded="false"] > span:first-of-type {
+    @apply block;
   }
 }
-[data-target="dropdown-menu-language-chooser-mobile"] {
-  & > span {
-    @apply block text-black font-normal text-sm;
+[data-target="dropdown-menu-main-desktop"] {
+  > span:first-of-type,
+  > svg:first-of-type {
+    @apply block;
   }
+}
+[data-target="dropdown-menu-main-desktop"] {
+  > span,
   > svg {
-    @apply w-5 h-6 flex-none text-xs font-normal text-black fill-current;
+    @apply hidden md:block;
   }
+}
-  & > ul {
-    @apply w-6 bg-gray;
-    > li {
-      @apply w-6 bg-gray;
-    }
-  }
+[data-target="dropdown-menu-participatory-space"],
+[data-target="dropdown-menu-order"],
+[data-target="dropdown-menu-resource"],
+[data-target="dropdown-menu-sidebar"] {
+  @apply md:hidden;
 }
 .dropdown {

data/app/packs/stylesheets/decidim/_footer.scss CHANGED Viewed

@@ -14,42 +14,6 @@ footer {
     &__down {
       @apply border-t border-black flex flex-wrap items-center gap-6 container py-6 text-white;
     }
-    &__language {
-      @apply absolute top-full left-0 bg-white rounded w-full;
-      &-container {
-        @apply relative;
-      }
-      &-trigger {
-        @apply flex items-center gap-1 border border-white rounded py-1.5 px-2 cursor-pointer text-md font-semibold;
-      }
-    }
-    /* overwrite default dropdown styles */
-    [data-target*="dropdown"] {
-      > svg {
-        @apply w-4 h-4 text-white fill-current last-of-type:block last-of-type:ml-auto;
-      }
-      &[aria-expanded="true"] > svg:first-of-type {
-        @apply block;
-      }
-      > span {
-        @apply block text-white;
-      }
-    }
-    /* overwrite default dropdown styles */
-    [id*="dropdown-menu"] {
-      @apply py-0 mx-0 w-full;
-      &[aria-hidden="true"] {
-        @apply md:hidden;
-      }
-    }
   }
   .mini-footer {

data/app/packs/stylesheets/decidim/_forms.scss CHANGED Viewed

@@ -1,11 +1,15 @@
 #form-search-mobile {
-  @apply py-1.5 px-4 bg-gray-5 rounded-lg border border-gray outline outline-1 outline-transparent;
+  @apply py-1.5 px-4 pr-8 bg-gray-5 rounded-lg border border-gray outline outline-1 outline-transparent;
   input[type="text"] {
     @apply bg-gray-5;
   }
 }
+#input-search-page {
+  @apply w-full px-4 pr-8;
+}
 .form-defaults {
   /* text-like inputs */
   input[type="date"],