Merge branch 'main' into multish

blocks/da-view/da-view-wc.css

@@ -22,7 +22,9 @@ h1 {
 }
 
 .da-content img {
+  object-fit: contain;
   max-width: 100%;
+  height: 600px;
   box-shadow: rgb(181 181 181) 0 0 20px 0;
 }
 

blocks/da-view/da-view.js

@@ -21,7 +21,7 @@ class DaView extends LitElement {
         <h1>${this.details.name}</h1>
       </div>
       <div class="da-content">
-        <img src="${this.details.contentUrl}" />
+        <img src="${this.details.contentUrl}" width="900" height="600" />
       </div>
     `;
   }

blocks/edit/da-editor/da-editor.css

@@ -195,10 +195,22 @@ span.ProseMirror-menuseparator {
   background: url('/blocks/edit/img/Smock_Unlink_18_N.svg') center / 18px no-repeat #EFEFEF;
 }
 
-.edit-list {
+.bullet-list, .ProseMirror-menu-dropdown.list-menu {
   background: url('/blocks/edit/img/Smock_TextBulleted_18_N.svg') center / 18px no-repeat #EFEFEF;
 }
 
+.ordered-list {
+  background: url('/blocks/edit/img/Smock_TextNumbered_18_N.svg') center / 18px no-repeat #EFEFEF;
+}
+
+.indent-list {
+  background: url('/blocks/edit/img/Smock_TextIndentIncrease_18_N.svg') center / 18px no-repeat #EFEFEF;
+}
+
+.outdent-list {
+  background: url('/blocks/edit/img/Smock_TextIndentDecrease_18_N.svg') center / 18px no-repeat #EFEFEF;
+}
+
 .insert-table {
   background: url('/blocks/edit/img/Smock_TableAdd_18_N.svg') center / 18px no-repeat #EFEFEF;
 }
@@ -263,7 +275,7 @@ span.ProseMirror-menuseparator {
   background: url('/blocks/edit/img/Smock_Redo_18_N.svg') center / 18px no-repeat #EFEFEF;
 }
 
-/* Generic ProseMirror Styles */  
+/* Generic ProseMirror Styles */
 .ProseMirror hr {
   border-radius: 1px;
   border: 1px solid #b3b3b3;

blocks/edit/da-library/da-library.js

@@ -127,7 +127,7 @@ class DaLibrary extends LitElement {
         <li class="da-library-type-item">
           <button class="da-library-type-item-btn"
             @click=${() => this.handleItemClick(item)}>
-            <div class="da-library-type-item-detail"> 
+            <div class="da-library-type-item-detail">
               ${item.icon ? until(this.renderIcon(item.icon)) : ''}
               <span>${name}</span>
               <svg class="icon">
@@ -193,13 +193,24 @@ class DaLibrary extends LitElement {
 
 customElements.define('da-library', DaLibrary);
 
+const CLOSE_DROPDOWNS_EVENT = 'pm-close-dropdowns';
+
 export default function open() {
   const palettePane = window.view.dom.nextElementSibling;
   const existingPalette = palettePane.querySelector('da-library');
   if (existingPalette) {
     existingPalette.remove();
     return;
   }
+  // close any other dropdowns
+  window.dispatchEvent(new CustomEvent(CLOSE_DROPDOWNS_EVENT));
+
   const palette = document.createElement('da-library');
   palettePane.append(palette);
+
+  const closePaletteListener = () => {
+    palette.remove();
+    window.removeEventListener(CLOSE_DROPDOWNS_EVENT, closePaletteListener);
+  };
+  window.addEventListener(CLOSE_DROPDOWNS_EVENT, closePaletteListener);
 }

blocks/edit/prose/index.js

@@ -14,6 +14,8 @@ import {
   goToNextCell,
   tableNodes,
   fixTables,
+  liftListItem,
+  sinkListItem,
   gapCursor,
   Y,
   WebsocketProvider,
@@ -262,6 +264,8 @@ export default function initProse({ editor, path }) {
         Tab: goToNextCell(1),
         'Shift-Tab': goToNextCell(-1),
       }),
+      keymap({ 'Shift-Tab': liftListItem(schema.nodes.list_item) }),
+      keymap({ Tab: sinkListItem(schema.nodes.list_item) }),
       gapCursor(),
       history(),
     ],

blocks/edit/prose/plugins/menu.js

@@ -19,6 +19,8 @@ import {
   undo,
   redo,
   wrapInList,
+  liftListItem,
+  sinkListItem,
 // eslint-disable-next-line import/no-unresolved
 } from 'da-y-wrapper';
 
@@ -55,10 +57,6 @@ function cmdItem(cmd, options) {
   return new MenuItem(passedOptions);
 }
 
-function wrapListItem(nodeType, options) {
-  return cmdItem(wrapInList(nodeType, options.attrs), options);
-}
-
 function markActive(state, type) {
   const { from, to, $from, $to, empty } = state.selection;
   if (empty) {
@@ -284,6 +282,49 @@ function getTextBlocks(marks, nodes) {
   ];
 }
 
+function shouldEnableIndentOutdentIcon(state, listType) {
+  const { $from } = state.selection;
+  if ($from.node($from.depth - 1)?.type === listType) return true;
+  return false;
+}
+
+function getListMenu(nodes) {
+  return [
+    new MenuItem({
+      title: 'Bullet List',
+      label: 'Bullet List',
+      class: 'bullet-list',
+      run(initialState, dispatch) {
+        wrapInList(nodes.bullet_list)(initialState, dispatch);
+      },
+    }),
+    new MenuItem({
+      title: 'Ordered List',
+      label: 'Ordered List',
+      class: 'ordered-list',
+      run(state, dispatch) {
+        wrapInList(nodes.ordered_list)(state, dispatch);
+      },
+    }),
+    new MenuItem({
+      title: 'Indent List',
+      label: 'Indent List',
+      class: 'indent-list',
+      enable(state) { return shouldEnableIndentOutdentIcon(state, nodes.list_item); },
+      run(state, dispatch) {
+        sinkListItem(nodes.list_item)(state, dispatch);
+      },
+    }),
+    new MenuItem({
+      title: 'Outdent List',
+      label: 'Outdent List',
+      class: 'outdent-list',
+      enable(state) { return shouldEnableIndentOutdentIcon(state, nodes.list_item); },
+      run: liftListItem(nodes.list_item),
+    }),
+  ];
+}
+
 function getMenu(view) {
   const menu = document.createElement('div');
   menu.className = 'ProseMirror-menubar';
@@ -302,10 +343,9 @@ function getMenu(view) {
   ];
 
   const listMenu = [
-    wrapListItem(nodes.bullet_list, {
-      title: 'Wrap in bullet list',
-      label: 'List',
-      class: 'edit-list',
+    new Dropdown(getListMenu(nodes), {
+      label: 'List Menu',
+      class: 'list-menu',
     }),
   ];
 
@@ -314,7 +354,9 @@ function getMenu(view) {
       title: 'Open library',
       label: 'Library',
       enable() { return true; },
-      run() { openLibrary(); },
+      run() {
+        openLibrary();
+      },
       class: 'open-library',
     }),
     new MenuItem({

blocks/shared/prose2aem.js

@@ -111,6 +111,15 @@ function removeMetadata(editor) {
   editor.querySelector('.metadata')?.remove();
 }
 
+const iconRegex = /:([a-zA-Z0-9-]+?):/gm; // any alphanumeric character or - surrounded by :
+function parseIcons(editor) {
+  if (!iconRegex.test(editor.innerHTML)) return;
+  editor.innerHTML = editor.innerHTML.replace(
+    iconRegex,
+    (_, iconName) => `<span class="icon icon-${iconName}"></span>`,
+  );
+}
+
 export default function prose2aem(editor, live) {
   editor.removeAttribute('class');
   editor.removeAttribute('contenteditable');
@@ -137,7 +146,10 @@ export default function prose2aem(editor, live) {
 
   convertBlocks(editor);
 
-  if (live) removeMetadata(editor);
+  if (live) {
+    removeMetadata(editor);
+    parseIcons(editor);
+  }
 
   makePictures(editor);
 

deps/da-y-wrapper/src/index.js

@@ -5,7 +5,7 @@ import { Schema, DOMParser, Fragment } from 'prosemirror-model';
 import { schema as baseSchema } from 'prosemirror-schema-basic';
 import { baseKeymap, toggleMark } from 'prosemirror-commands';
 import { history, undo, redo } from 'prosemirror-history';
-import { addListNodes, wrapInList } from 'prosemirror-schema-list';
+import { addListNodes, wrapInList, splitListItem, liftListItem, sinkListItem } from 'prosemirror-schema-list';
 import { keymap } from 'prosemirror-keymap';
 import { buildKeymap } from 'prosemirror-example-setup';
 import { gapCursor } from 'prosemirror-gapcursor';
@@ -80,6 +80,9 @@ export {
   blockTypeItem,
   toggleMark,
   wrapInList,
+  splitListItem,
+  liftListItem,
+  sinkListItem,
   undo,
   redo,
   Y,

deps/prosemirror-menu/dist/index.js

@@ -6,6 +6,8 @@ import { Plugin } from 'prosemirror-state';
 const SVG = "http://www.w3.org/2000/svg";
 const XLINK = "http://www.w3.org/1999/xlink";
 const prefix$2 = "ProseMirror-icon";
+const CLOSE_DROPDOWNS_EVENT = 'pm-close-dropdowns';
+
 function hashPath(path) {
     let hash = 0;
     for (let i = 0; i < path.length; i++)
@@ -136,12 +138,7 @@ class Dropdown {
     /**
     Create a dropdown wrapping the elements.
     */
-    constructor(content, 
-    /**
-    @internal
-    */
-    options = {}) {
-        this.options = options;
+    constructor(content, options = { sticky: true }) {
         this.options = options || {};
         this.content = Array.isArray(content) ? content : [content];
     }
@@ -158,23 +155,33 @@ class Dropdown {
         let wrap = crel("div", { class: prefix$1 + "-dropdown-wrap" }, label);
         let open = null;
         let listeningOnClose = null;
+        let closeDropdownListener = null;
         let close = () => {
             if (open && open.close()) {
                 open = null;
-                win.removeEventListener("mousedown", listeningOnClose);
+                if (!this.options.sticky) {
+                  win.removeEventListener("mousedown", listeningOnClose);
+                }
+                win.removeEventListener(CLOSE_DROPDOWNS_EVENT, closeDropdownListener);
             }
         };
+
         label.addEventListener("mousedown", e => {
             e.preventDefault();
             markMenuEvent(e);
             if (open) {
                 close();
-            }
-            else {
+            } else {
+                win.dispatchEvent(new CustomEvent(CLOSE_DROPDOWNS_EVENT));
                 open = this.expand(wrap, content.dom);
-                win.addEventListener("mousedown", listeningOnClose = () => {
-                    if (!isMenuEvent(wrap))
-                        close();
+                if (!this.options.sticky) {
+                  win.addEventListener("mousedown", listeningOnClose = () => {
+                      if (!isMenuEvent(wrap))
+                          close();
+                  });
+                }
+                win.addEventListener(CLOSE_DROPDOWNS_EVENT, closeDropdownListener = () => {
+                    close();
                 });
             }
         });
@@ -232,7 +239,7 @@ class DropdownSubmenu {
     Creates a submenu for the given group of menu elements. The
     following options are recognized:
     */
-    constructor(content, 
+    constructor(content,
     /**
     @internal
     */

img/favicons/favicon.webmanifest

@@ -1,5 +1,5 @@
 {
-    "name": "Milo College",
+    "name": "Dark Alley",
     "display": "standalone",
     "icons": [
         { "src": "/img/favicons/favicon-192.png", "sizes": "192x192", "type": "image/png" },

scripts/utils.js

@@ -17,10 +17,10 @@ export const [setNx, getNx] = (() => {
     (nxBase, location) => {
       nx = (() => {
         const { hostname, search } = location || window.location;
-        if (!(hostname.includes('.hlx.') || hostname.includes('local'))) return nxBase;
+        if (!(hostname.includes('.hlx.') || hostname.includes('.aem.') || hostname.includes('local'))) return nxBase;
         const branch = new URLSearchParams(search).get('nx') || 'main';
         if (branch === 'local') return 'http://localhost:6456/nx';
-        return branch.includes('--') ? `https://${branch}.hlx.live/nx` : `https://${branch}--nexter--da-sites.hlx.live/nx`;
+        return branch.includes('--') ? `https://${branch}.aem.live/nx` : `https://${branch}--nexter--da-sites.aem.live/nx`;
       })();
       return nx;
     }, () => nx,