@afeefa/vue-app 0.0.91 → 0.0.93

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.91
+0.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/ARichTextArea.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="['a-rich-text-editor a-text-input', {'a-text-input-focused': focus}]">
+  <div :class="['a-rich-text-editor a-text-input', {'a-text-input-focused': editorFocus}]">
     <div
       v-if="editor"
       class="menu-bar"
@@ -7,7 +7,8 @@
       <div>
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('bold')}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('bold')}]"
+          title="fett"
           @click="editor.chain().focus().toggleBold().run()"
         >
           <v-icon>{{ boldIcon }}</v-icon>
@@ -15,7 +16,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('italic')}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('italic')}]"
+          title="kursiv"
           @click="editor.chain().focus().toggleItalic().run()"
         >
           <v-icon>{{ italicIcon }}</v-icon>
@@ -23,7 +25,8 @@
 
         <v-btn
           small
-          :class="['menu-button', 'strike', {'is-active': focus && editor.isActive('strike')}]"
+          :class="['menu-button', 'strike', {'is-active': editorFocus && editor.isActive('strike')}]"
+          title="durchgestrichen"
           @click="editor.chain().focus().toggleStrike().run()"
         >
           <v-icon>{{ strikeIcon }}</v-icon>
@@ -31,7 +34,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('heading', {level: 1})}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('heading', {level: 1})}]"
+          title="überschrift 1"
           @click="editor.chain().focus().toggleHeading({level: 1}).run()"
         >
           <v-icon>{{ h1Icon }}</v-icon>
@@ -39,7 +43,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('heading', {level: 2})}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('heading', {level: 2})}]"
+          title="pberschrift 2"
           @click="editor.chain().focus().toggleHeading({level: 2}).run()"
         >
           <v-icon>{{ h2Icon }}</v-icon>
@@ -47,7 +52,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('bulletList')}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('bulletList')}]"
+          title="punkt-liste"
           @click="editor.chain().focus().toggleBulletList().run()"
         >
           <v-icon>{{ ulIcon }}</v-icon>
@@ -55,7 +61,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('orderedList')}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('orderedList')}]"
+          title="nummerierte liste"
           @click="editor.chain().focus().toggleOrderedList().run()"
         >
           <v-icon>{{ olIcon }}</v-icon>
@@ -63,7 +70,8 @@
 
         <v-btn
           small
-          :class="['menu-button', {'is-active': focus && editor.isActive('blockquote')}]"
+          :class="['menu-button', {'is-active': editorFocus && editor.isActive('blockquote')}]"
+          title="zitat"
           @click="editor.chain().focus().toggleBlockquote().run()"
         >
           <v-icon>{{ commentIcon }}</v-icon>
@@ -72,13 +80,37 @@
         <v-btn
           small
           class="menu-button"
+          :class="{ 'is-active': editorFocus && editorSelectionIs('#0000FF')}"
+          title="blau"
+          color="blue--text"
+          @click="editorSelectionIs('#0000FF') ? editor.chain().focus().unsetColor().run() : editor.chain().focus().setColor('#0000FF').run()"
+        >
+          <v-icon>$paletteIcon</v-icon>
+        </v-btn>
+
+        <v-btn
+          small
+          class="menu-button"
+          :class="{ 'is-active': editorFocus && editorSelectionIs('#FF0000')}"
+          title="rot"
+          color="red--text"
+          @click="editorSelectionIs('#FF0000') ? editor.chain().focus().unsetColor().run() : editor.chain().focus().setColor('#FF0000').run()"
+        >
+          <v-icon>$paletteIcon</v-icon>
+        </v-btn>
+
+        <v-btn
+          small
+          class="menu-button undo-button"
           :disabled="initialValue === editor.getHTML()"
+          title="rückgängig"
           @click="editor.chain().focus().undo().run()"
         >
           <v-icon>{{ undoIcon }}</v-icon>
         </v-btn>
       </div>
 
+
       <div>
         <slot name="buttons" />
       </div>
@@ -86,7 +118,7 @@
 
     <editor-content
       :editor="editor"
-      :class="['a-rich-text-editor', {focus}]"
+      :class="['a-rich-text-editor', {editorFocus}]"
     />
   </div>
 </template>
@@ -108,9 +140,11 @@ import {
   mdiRotateLeft,
   mdiRotateRight
 } from '@mdi/js'
+import { Color } from '@tiptap/extension-color'
+import TextStyle from '@tiptap/extension-text-style'
 
 @Component({
-  props: ['value', 'validator'],
+  props: ['value', 'validator', 'focus'],
   components: {
     EditorContent
   }
@@ -119,7 +153,7 @@ export default class ARichTextArea extends Vue {
   editor = null
   internalValue = null
   initialValue = null
-  focus = false
+  editorFocus = false
 
   boldIcon = mdiFormatBold
   italicIcon = mdiFormatItalic
@@ -137,25 +171,34 @@ export default class ARichTextArea extends Vue {
     this.internalValue = this.value
   }
 
+  changed () {
+    console.log('Changed')
+  }
+
   mounted () {
+    this.editorFocus = !!this.focus
+
     if (this.validator) {
       this.$refs.input.validate(true)
     }
 
     this.editor = new Editor({
       content: this.internalValue,
+      autofocus: this.focus ? 'end' : false,
       extensions: [
-        StarterKit
+        StarterKit,
+        TextStyle,
+        Color
       ],
       onUpdate: () => {
         this.$emit('input', this.editor.getHTML())
       },
       onFocus: ({ editor, event }) => {
-        this.focus = true
+        this.editorFocus = true
         this.$emit('focus')
       },
       onBlur: ({ editor, event }) => {
-        this.focus = false
+        this.editorFocus = false
         this.$emit('blur')
       }
     })
@@ -165,6 +208,10 @@ export default class ARichTextArea extends Vue {
     this.editor.destroy()
   }
 
+  editorSelectionIs (color) {
+    return this.editor.isActive('textStyle', { color: color })
+  }
+
   /**
    * reset the text area to disable the undo button
    * e.g. after saving the form while keeping it open
@@ -180,6 +227,10 @@ export default class ARichTextArea extends Vue {
     const isSame = this.editor.getHTML() === this.internalValue
     if (!isSame) {
       this.editor.commands.setContent(this.internalValue, false)
+      // witch reusing the editor component, we need to restore the focus state
+      if (this.focus && this.focus === true) {
+        this.editor.commands.focus('end')
+      }
     }
   }
 
@@ -240,11 +291,18 @@ export default class ARichTextArea extends Vue {
     width: unset;
   }
 
+  &:disabled {
+    background: none !important;
+    :deep(*) {
+      color: #CCCCCC !important;
+    }
+  }
+
   &.is-active {
     background: #ECECEC !important;
   }
 
-  &[disabled] {
+  &.menu-button:disabled {
     background: none !important;
   }
 }

package/src/components/form/fields/FormFieldRichTextArea.vue

@@ -1,5 +1,9 @@
 <template>
-  <a-rich-text-area v-model="model[name]">
+  <a-rich-text-area
+    v-model="model[name]"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
     <template #buttons>
       <slot name="buttons" />
     </template>

package/src/services/escape/CascadingWindowEventDispatcher.js

@@ -10,6 +10,10 @@ class CascadingWindowEventDispatcher {
   addEventListener (event, listener) {
     if (!this.listeners[event]) {
       this.listeners[event] = []
+    }
+
+    if (!this.listeners[event].length) {
+      this.listeners[event] = []
 
       window.addEventListener(event, e => {
         for (const listener of this.listeners[event]) {

package/src-admin/components/form/RemoveButton.vue

@@ -4,14 +4,14 @@
       <v-btn
         :class="'a-btn-standard removeButton-' + dialogId"
         fab
-        small
         :color="(hover ? 'red' : 'grey lighten-3')"
         :title="title"
+        v-bind="{ small: isSmall, ...$attrs}"
         @click="remove"
       >
         <v-icon
           class="white--hover"
-          size="1.3rem"
+          :size="iconSize || '1.3rem'"
         >
           $trashCanIcon
         </v-icon>
@@ -44,13 +44,17 @@ import { DialogEvent } from '@a-vue/events'
 import { randomCssClass } from '@a-vue/utils/random'
 
 @Component({
-  props: ['title', 'message', 'info', 'itemTitle', 'protect']
+  props: ['iconSize', 'title', 'message', 'info', 'itemTitle', 'protect']
 })
 export default class EditPage extends Vue {
   dialogId = randomCssClass(10)
   removeKey = null
   removeConfirmed = null
 
+  get isSmall () {
+    return Object.keys(this.$attrs).filter(k => k.match(/x-small|default|large|x-large/)).length === 0
+  }
+
   async remove () {
     if (this.protect) {
       this.removeKey = [...Array(6)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')

package/src-admin/config/vuetify.js

@@ -1,13 +1,14 @@
 import {
   mdiAlarmLightOutline,
-  mdiArrowLeft,
   mdiAlert,
+  mdiArrowLeft,
   mdiCalendar,
   mdiCheck,
   mdiCheckBold,
   mdiChevronRight,
   mdiClose,
   mdiCloseThick,
+  mdiCurrencyEur,
   mdiDelete,
   mdiDotsHorizontal,
   mdiDotsVertical,
@@ -16,11 +17,11 @@ import {
   mdiMagnify,
   mdiMenuDown,
   mdiMenuUp,
+  mdiPalette,
   mdiPencil,
   mdiPlus,
   mdiPrinter,
-  mdiThumbUpOutline,
-  mdiCurrencyEur
+  mdiThumbUpOutline
 } from '@mdi/js'
 import Vue from 'vue'
 import Vuetify from 'vuetify/lib'
@@ -52,7 +53,8 @@ export default new Vuetify({
       caretDownIcon: mdiMenuDown,
       caretUpIcon: mdiMenuUp,
       printerIcon: mdiPrinter,
-      euroSymbol: mdiCurrencyEur
+      euroSymbol: mdiCurrencyEur,
+      paletteIcon: mdiPalette
     }
   },
   breakpoint: {

package/src-admin/styles.scss

@@ -59,6 +59,10 @@
   opacity: .08;
 }
 
+.theme--light.v-input .error--text {
+  color: #616161 !important;
+}
+
 .theme--light.v-btn.v-btn--disabled,
 .theme--light.v-btn.v-btn--disabled span,
 .theme--light.v-btn.v-btn--disabled .v-icon,
@@ -66,6 +70,11 @@
   color: white !important;
 }
 
+.theme--light.v-btn:focus-visible {
+  outline: 2px solid #1976d2;
+}
+
+
 .theme--light.v-btn.v-btn--disabled.v-btn--has-bg {
   background-color: #EEEEEE !important;
 }