@teipublisher/pb-components 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teipublisher/pb-components",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Collection of webcomponents underlying TEI Publisher",
   "repository": "https://github.com/eeditiones/tei-publisher-components.git",
   "main": "index.html",
@@ -27,7 +27,8 @@
     "format:prettier": "prettier \"**/*.js\" --write --ignore-path .gitignore",
     "lint": "npm run lint:eslint && npm run lint:prettier",
     "format": "npm run format:eslint && npm run format:prettier",
-    "clean": "rimraf dist lib css images/leaflet images/openseadragon demo/build docs",
+    "clean": "npm run clean-lib && rimraf dist css images/leaflet demo/build docs",
+    "clean-lib": "rimraf -g lib/leaflet* lib/paged*",
     "prepare": "npm run docs && npm run build:production",
     "semantic-release": "semantic-release",
     "gh-pages": "node gh-pages.js"
@@ -81,7 +82,6 @@
     "lit-element": "latest",
     "lit-html": "^1.3.0",
     "marked": "^1.2.0",
-    "openseadragon": "github:Jinntec/openseadragon",
     "pagedjs": "^0.4.0",
     "prismjs": "^1.21.0",
     "tippy.js": "^6.2.7",

package/pb-elements.json

@@ -2500,7 +2500,7 @@
     {
       "name": "pb-collapse",
       "path": "./src/pb-collapse.js",
-      "description": "A collapsible block: in collapsed state it only shows a header and expands if clicked.\r\nThe header should go into slot `collapse-trigger`, the content into `collapse-content`.\r\nExample:\r\n\r\n```html\r\n<pb-collapse>\r\n   <div slot=\"collapse-trigger\">\r\n       Metadata\r\n   </div>\r\n   <pb-view slot=\"collapse-content\" src=\"document1\" subscribe=\"transcription\" xpath=\"//teiHeader\"></pb-view>\r\n</pb-collapse>\r\n```",
+      "description": "A collapsible block: in collapsed state it only shows a header and expands if clicked.\nThe header should go into slot `collapse-trigger`, the content into `collapse-content`.\nExample:\n\n```html\n<pb-collapse>\n   <div slot=\"collapse-trigger\">\n       Metadata\n   </div>\n   <pb-view slot=\"collapse-content\" src=\"document1\" subscribe=\"transcription\" xpath=\"//teiHeader\"></pb-view>\n</pb-collapse>\n```\n\nBy adding a CSS 'icon-right' to a `pb-collapse` the icon can be placed on the right side\n```\n<pb-collapse class='icon-right'>\n```",
       "attributes": [
         {
           "name": "horizontal",
@@ -2540,7 +2540,7 @@
         },
         {
           "name": "toggles",
-          "description": "By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.\r\nSet to true to keep multiple pb-collapse open at the same time.",
+          "description": "By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.\nSet to true to keep multiple pb-collapse open at the same time.",
           "type": "boolean",
           "default": "false"
         },
@@ -2622,7 +2622,7 @@
         {
           "name": "toggles",
           "attribute": "toggles",
-          "description": "By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.\r\nSet to true to keep multiple pb-collapse open at the same time.",
+          "description": "By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.\nSet to true to keep multiple pb-collapse open at the same time.",
           "type": "boolean",
           "default": "false"
         },

package/src/pb-collapse.js

@@ -1,184 +1,197 @@
-import { LitElement, html, css } from 'lit-element';
-import { pbMixin } from './pb-mixin.js';
-import { themableMixin } from "./theming.js";
-import '@polymer/iron-icon';
-import '@polymer/iron-icons';
-import '@polymer/iron-collapse';
-
-
-/**
- * A collapsible block: in collapsed state it only shows a header and expands if clicked.
- * The header should go into slot `collapse-trigger`, the content into `collapse-content`.
- * Example:
- * 
- * ```html
- * <pb-collapse>
- *   <div slot="collapse-trigger">
- *       Metadata
- *   </div>
- *   <pb-view slot="collapse-content" src="document1" subscribe="transcription" xpath="//teiHeader"></pb-view>
- * </pb-collapse>
- * ```
- *
- * @slot collapse-trigger - trigger toggling collapsed content on/off
- * @slot collapse-content - content to be collapsed
- * @cssprop [--pb-collapse-icon-padding=0 4px 0 0] - padding in px for the "caret-down" icon left to the collapsible item
- * @fires pb-collapse-open - Fires opening the collapsed section
- */
-export class PbCollapse extends themableMixin(pbMixin(LitElement)) {
-    static get properties() {
-        return {
-            ...super.properties,
-            /**
-             * @deprecated
-             * Corresponds to the iron-collapse's horizontal property.
-             */
-            horizontal: {
-                type: Boolean
-            },
-            /**
-             * Corresponds to the iron-collapse's noAnimation property.
-             *
-             */
-            noAnimation: {
-                type: Boolean,
-                attribute: 'no-animation'
-            },
-            /**
-             * Whether currently expanded.
-             *
-             */
-            opened: {
-                type: Boolean
-            },
-            /**
-             * By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.
-             * Set to true to keep multiple pb-collapse open at the same time.
-             */
-            toggles: {
-                type: Boolean
-            },
-            /**
-             * The iron-icon when collapsed. Value must be one of the icons defined by iron-icons
-             */
-            expandIcon: {
-                type: String,
-                attribute: 'expand-icon'
-            },
-            /**
-             * The icon when expanded.
-             */
-            collapseIcon: {
-                type: String,
-                attribute: 'collapse-icon'
-            },
-            /**
-             * Whether to hide the expand/collapse icon.
-             */
-            noIcons: {
-                type: Boolean,
-                attribute: 'no-icons'
-            }
-        };
-    }
-
-    constructor() {
-        super();
-        this.horizontal = false;
-        this.noAnimation = false;
-        this.opened = false;
-        this.expandIcon = 'icons:expand-more';
-        this.collapseIcon = 'icons:expand-less';
-        this.noIcons = false;
-        this.toggles = false;
-    }
-
-    connectedCallback() {
-        super.connectedCallback();
-        this.addEventListener('pb-collapse-open', () => {
-            this.open();
-        });
-        if (this.toggles) {
-            this.subscribeTo('pb-collapse-open', (ev) => {
-                if (!ev.detail || ev.detail._source === this) {
-                    return;
-                }
-                for (const collapse of this.querySelectorAll('pb-collapse')) {
-                    if (collapse === ev.detail._source) {
-                        return;
-                    }
-                }
-                this.close();
-            });
-        }
-    }
-
-    /**
-             * opens the collapsible section
-             */
-    open() {
-        if (this.opened) {
-            return;
-        }
-        this.opened = true;
-
-        this.emitTo('pb-collapse-open', this);
-    }
-
-    /**
-     * closes the collapsible section
-     */
-    close() {
-        if (this.opened) {
-            this.opened = false;
-        }
-    }
-
-    /**
-     * toggles the collapsible state
-     */
-    toggle() {
-        this.opened = !this.opened;
-        if (this.opened) {
-            this.emitTo('pb-collapse-open', this.data);
-        }
-    }
-
-    render() {
-        return html`
-            <div id="trigger" @click="${this.toggle}" class="collapse-trigger">
-                ${
-            !this.noIcons ?
-                html`<iron-icon icon="${this.opened ? this.collapseIcon : this.expandIcon}"></iron-icon>` :
-                null
-            }
-                <slot id="collapseTrigger" name="collapse-trigger"></slot>
-            </div>
-            <iron-collapse id="collapse" horizontal="${this.horizontal}" no-animation="${this.noAnimation}" .opened="${this.opened}">
-                <slot name="collapse-content"></slot>
-            </iron-collapse>
-        `;
-    }
-
-    static get styles() {
-        return css`
-            :host {
-                display: block;
-            }
-
-            #trigger {
-                display: table-row;
-            }
-
-            #trigger iron-icon {
-                display: table-cell;
-                padding: var(--pb-collapse-icon-padding, 0 4px 0 0);
-            }
-
-            slot[name="collapse-trigger"] {
-                display: table-cell;
-            }
-        `;
-    }
-}
-customElements.define('pb-collapse', PbCollapse);
+import {LitElement, html, css} from 'lit-element';
+import {pbMixin} from './pb-mixin.js';
+import {themableMixin} from "./theming.js";
+import '@polymer/iron-icon';
+import '@polymer/iron-icons';
+import '@polymer/iron-collapse';
+
+
+/**
+ * A collapsible block: in collapsed state it only shows a header and expands if clicked.
+ * The header should go into slot `collapse-trigger`, the content into `collapse-content`.
+ * Example:
+ *
+ * ```html
+ * <pb-collapse>
+ *   <div slot="collapse-trigger">
+ *       Metadata
+ *   </div>
+ *   <pb-view slot="collapse-content" src="document1" subscribe="transcription" xpath="//teiHeader"></pb-view>
+ * </pb-collapse>
+ * ```
+ *
+ * By adding a CSS 'icon-right' to a `pb-collapse` the icon can be placed on the right side
+ * ```
+ * <pb-collapse class='icon-right'>
+ * ```
+ *
+ * @slot collapse-trigger - trigger toggling collapsed content on/off
+ * @slot collapse-content - content to be collapsed
+ * @cssprop [--pb-collapse-icon-padding=0 4px 0 0] - padding in px for the "caret-down" icon left to the collapsible item
+ * @fires pb-collapse-open - Fires opening the collapsed section
+ */
+export class PbCollapse extends themableMixin(pbMixin(LitElement)) {
+    static get properties() {
+        return {
+            ...super.properties,
+            /**
+             * @deprecated
+             * Corresponds to the iron-collapse's horizontal property.
+             */
+            horizontal: {
+                type: Boolean
+            },
+            /**
+             * Corresponds to the iron-collapse's noAnimation property.
+             *
+             */
+            noAnimation: {
+                type: Boolean,
+                attribute: 'no-animation'
+            },
+            /**
+             * Whether currently expanded.
+             *
+             */
+            opened: {
+                type: Boolean
+            },
+            /**
+             * By default, an open collapse is closed if another pb-collapse is expanded on the same event channel.
+             * Set to true to keep multiple pb-collapse open at the same time.
+             */
+            toggles: {
+                type: Boolean
+            },
+            /**
+             * The iron-icon when collapsed. Value must be one of the icons defined by iron-icons
+             */
+            expandIcon: {
+                type: String,
+                attribute: 'expand-icon'
+            },
+            /**
+             * The icon when expanded.
+             */
+            collapseIcon: {
+                type: String,
+                attribute: 'collapse-icon'
+            },
+            /**
+             * Whether to hide the expand/collapse icon.
+             */
+            noIcons: {
+                type: Boolean,
+                attribute: 'no-icons'
+            }
+        };
+    }
+
+    constructor() {
+        super();
+        this.horizontal = false;
+        this.noAnimation = false;
+        this.opened = false;
+        this.expandIcon = 'icons:expand-more';
+        this.collapseIcon = 'icons:expand-less';
+        this.noIcons = false;
+        this.toggles = false;
+    }
+
+    connectedCallback() {
+        super.connectedCallback();
+        this.addEventListener('pb-collapse-open', () => {
+            this.open();
+        });
+        if (this.toggles) {
+            this.subscribeTo('pb-collapse-open', (ev) => {
+                if (!ev.detail || ev.detail._source === this) {
+                    return;
+                }
+                for (const collapse of this.querySelectorAll('pb-collapse')) {
+                    if (collapse === ev.detail._source) {
+                        return;
+                    }
+                }
+                this.close();
+            });
+        }
+    }
+
+    /**
+     * opens the collapsible section
+     */
+    open() {
+        if (this.opened) {
+            return;
+        }
+        this.opened = true;
+
+        this.emitTo('pb-collapse-open', this);
+    }
+
+    /**
+     * closes the collapsible section
+     */
+    close() {
+        if (this.opened) {
+            this.opened = false;
+        }
+    }
+
+    /**
+     * toggles the collapsible state
+     */
+    toggle() {
+        this.opened = !this.opened;
+        if (this.opened) {
+            this.emitTo('pb-collapse-open', this.data);
+        }
+    }
+
+    render() {
+        return html`
+            <div id="trigger" @click="${this.toggle}" class="collapse-trigger">
+                ${
+                    !this.noIcons ?
+                html`<iron-icon icon="${this.opened ? this.collapseIcon : this.expandIcon}"></iron-icon>` :
+                        null
+                }
+                <slot id="collapseTrigger" name="collapse-trigger"></slot>
+            </div>
+            <iron-collapse id="collapse" horizontal="${this.horizontal}" no-animation="${this.noAnimation}" .opened="${this.opened}">
+                <slot name="collapse-content"></slot>
+            </iron-collapse>
+        `;
+    }
+
+    static get styles() {
+        return css`
+            :host {
+                display: block;
+                position: relative;
+            }
+
+            #trigger {
+                display: table-row;
+            }
+
+            iron-icon {
+                display: table-cell;
+                padding: var(--pb-collapse-icon-padding, 0 4px 0 0);
+            }
+
+            :host(.icon-right) iron-icon {
+                position: absolute;
+                right: 0;
+            }
+
+            slot[name="collapse-trigger"] {
+                display: table-cell;
+            }
+        `;
+    }
+}
+if (!customElements.get('pb-collapse')) {
+    customElements.define('pb-collapse', PbCollapse);
+}

package/src/pb-login.js

@@ -129,16 +129,22 @@ export class PbLogin extends pbMixin(LitElement) {
             };
             this._checkLogin.generateRequest();
         });
+        this.addEventListener('keyup', event => {
+            if (event.keyCode === 13) {
+                event.preventDefault();
+                this._confirmLogin();
+            }
+        });
     }
 
     render() {
         return html`
-            <a href="#" @click="${this._show}" title="${this.user}">
+            <a href="#" @click="${this._show}" role="button" title="${this.user ? this.user : this.loginLabel}">
                 ${
             this.loggedIn ?
                 html`<iron-icon icon="${this.logoutIcon}"></iron-icon> <span class="label">${translate(this.logoutLabel, { user: this.user })}</span>` :
                 html`<iron-icon icon="${this.loginIcon}"></iron-icon> <span class="label">${translate(this.loginLabel)}</span>`
-            }                
+            }
             </a>
 
             <paper-dialog id="loginDialog">
@@ -191,12 +197,8 @@ export class PbLogin extends pbMixin(LitElement) {
             a {
                 color: var(--pb-login-link-color, --pb-link-color);
                 text-decoration: none;
-            }
-
-            @media (max-width: 1024px) {
-                .label {
-                    display: none;
-                }
+                display: flex;
+                gap:0.5rem;
             }
 
             #message {
@@ -280,4 +282,4 @@ export class PbLogin extends pbMixin(LitElement) {
      * @param {Array<String>} groups groups the user is a member of
      */
 }
-customElements.define('pb-login', PbLogin);
+customElements.define('pb-login', PbLogin);

package/.travis.yml

@@ -1,20 +0,0 @@
-dist: xenial
-language: node_js
-node_js:
-    - 14
-services:
-  - docker
-env:
-  - img=existdb/teipublisher:6.0.0-RC1
-before_install:
-  - docker pull $img
-  - docker create  --name exist-ci -p 8080:8080 $img
-  - npm prune
-install:
-  - npm install -q
-before_script:
-  - docker start exist-ci
-  # exist needs time
-  - sleep 30
-script:
-    - npm test