comand-component-library 3.1.66 → 3.1.69

package/src/components/CmdBoxSiteSearch.vue

@@ -13,52 +13,72 @@
 
         <!-- begin form-elements -->
         <div class="flex-container">
-            <!-- begin CmdFormElement -->
+            <!-- begin CmdFormElement for first input -->
             <CmdFormElement
+                v-if="cmdFormElementInput1.show"
                 element="input"
-                type="text"
-                :labelText="getMessage('cmdsitesearch.labeltext.what_to_search')"
-                :placeholder="getMessage('cmdsitesearch.placeholder.what_to_search')"
+                :type="cmdFormElementInput1.type"
+                :show-label="cmdFormElementInput1.showLabel"
+                :labelText="cmdFormElementInput1.labelText"
+                :placeholder="cmdFormElementInput1.placeholder"
+                v-model="searchValue1"
             />
-            <!-- end CmdFormElement -->
+            <!-- end CmdFormElement for first input -->
 
-            <!-- begin CmdFormElement -->
-            <CmdFormElement
-                element="input"
-                type="text"
-                :labelText="getMessage('cmdsitesearch.labeltext.where_to_search')"
-                :placeholder="getMessage('cmdsitesearch.placeholder.where_to_search')"
-            />
-            <!-- end CmdFormElement -->
+            <div class="flex-container no-gap">
+                <!-- begin CmdFormElement for second input -->
+                <CmdFormElement
+                    v-if="cmdFormElementInput2.show"
+                    element="input"
+                    :type="cmdFormElementInput2.type"
+                    :show-label="cmdFormElementInput2.showLabel"
+                    :labelText="cmdFormElementInput2.labelText"
+                    :placeholder="cmdFormElementInput2.placeholder"
+                    v-model="searchValue2"
+                />
+                <!-- end CmdFormElement for second input -->
 
-            <!-- begin CmdFormElement -->
+                <!-- begin CmdFormElement for radius -->
+                <CmdFormElement
+                    v-if="cmdFormElementRadius.show"
+                    element="select"
+                    class="no-flex"
+                    v-model="radius"
+                    :show-label="cmdFormElementRadius.showLabel"
+                    :labelText="cmdFormElementRadius.labelText"
+                    :select-options="cmdFormElementRadius.selectOptions"
+                />
+                <!-- end CmdFormElement for radius -->
+            </div>
+
+            <!-- begin CmdFormElement for search-button -->
             <CmdFormElement
                 element="button"
-                :buttonText="buttonText"
-                :buttonIcon="{iconClass: 'icon-search', iconPosition: 'before'}"
-                @click="$emit('click', $event)"
+                :nativeButton="cmdFormElementSearchButton"
+                @click="onSearchButtonClick"
                 aria-live="assertive"
             />
-            <!-- end CmdFormElement -->
+            <!-- end CmdFormElement for search-button -->
+
         </div>
         <!-- end form-elements -->
 
         <!-- begin filters -->
-        <template v-if="useFilters">
+        <template v-if="cmdFakeSelect?.show">
             <a href="#" @click.prevent="showFilters = !showFilters">
                 <span :class="showFilters ? 'icon-single-arrow-up' : 'icon-single-arrow-down'"></span>
                 <span v-if="showFilters">{{ getMessage("cmdsitesearch.hide_filter_options") }}</span>
                 <span v-else>{{ getMessage("cmdsitesearch.show_filter_options") }}</span>
             </a>
             <transition name="fade">
-                <div v-if="showFilters && listOfFilters.length" class="flex-container no-flex" aria-expanded="true">
+                <div v-if="showFilters && cmdFakeSelect?.selectData.length" class="flex-container no-flex" aria-expanded="true">
                     <!-- begin CmdFakeSelect -->
                     <CmdFakeSelect
-                        :selectData="listOfFilters"
-                        v-model="fakeSelectFilters"
-                        defaultOptionName="Select filters:"
-                        type="checkboxOptions"
-                        labelText="Filters:"
+                        :selectData="cmdFakeSelect?.selectData"
+                        v-model="searchFilters"
+                        :defaultOptionName="cmdFakeSelect?.defaultOptionName"
+                        :type="cmdFakeSelect?.type"
+                        :labelText="cmdFakeSelect?.labelText"
                     />
                     <!-- end CmdFakeSelect -->
                 </div>
@@ -66,7 +86,7 @@
         </template>
         <!-- end filters -->
     </fieldset>
-    <CmdFormFilters v-if="useFilters" v-model="fakeSelectFilters" :selectedOptionsName="getOptionName"/>
+    <CmdFormFilters v-if="cmdFakeSelect?.show" v-model="searchFilters" :selectedOptionsName="getOptionName"/>
 </template>
 
 <script>
@@ -81,6 +101,13 @@ import CmdFormElement from "./CmdFormElement"
 import CmdFormFilters from "./CmdFormFilters"
 
 export default {
+    emits: [
+        "search",
+        "update:modelValueInput1",
+        "update:modelValueInput2",
+        "update:modelValueRadius",
+        "update:modelValueSearchFilters"
+    ],
     name: "CmdBoxSiteSearch",
     mixins: [I18n, DefaultMessageProperties],
     components: {
@@ -91,34 +118,45 @@ export default {
     },
     data() {
         return {
-            showFilters: false,
-            fakeSelectFilters: []
+            showFilters: false
         }
     },
     props: {
         /**
-         * the native modelValue for v-model given from outside for pre-sets
+         * custom modelValue for first input-field
          */
-        modelValue: {
-            type: Array,
+        modelValueInput1: {
+            type: String,
             required: false
         },
         /**
-         * toggle use of filters (must configured)
+         * custom modelValue for second input-field
          */
-        useFilters: {
-            type: Boolean,
-            default: true
+        modelValueInput2: {
+            type: String,
+            required: false
         },
         /**
-         * set list of filters
-         *
-         * useFilters-property must be activated
+         * custom modelValue for radius
+         */
+        modelValueRadius: {
+            type: [String, Number],
+            required: false
+        },
+        /**
+         * custom modelValue for search-filters
          */
-        listOfFilters: {
+        modelValueSearchFilters: {
             type: Array,
             required: false
         },
+        /**
+         * toggle use of filters (must configured)
+         */
+        useFilters: {
+            type: Boolean,
+            default: true
+        },
         /**
          * text for legend
          *
@@ -150,31 +188,168 @@ export default {
         cmdCustomHeadline: {
             type: Object,
             required: false
+        },
+        /**
+         * properties for CmdFormElement-component first search-field
+         */
+        cmdFormElementInput1: {
+            type: Object,
+            default() {
+                return {
+                    show: true,
+                    type: "text",
+                    showLabel: true,
+                    labelText: "What do you like to search for?",
+                    placeholder: "Search"
+                }
+            }
+        },
+        /**
+         * properties for CmdFormElement-component for second search-field
+         */
+        cmdFormElementInput2: {
+            type: Object,
+            default() {
+                return {
+                    show: true,
+                    type: "text",
+                    showLabel: true,
+                    labelText: "Where do you like to search?",
+                    placeholder: "City, Zip"
+                }
+            }
+        },
+        /**
+         * properties for CmdFormElement-component for radius
+         */
+        cmdFormElementRadius: {
+            type: Object,
+            default() {
+                return {
+                    show: true,
+                    showLabel: true,
+                    labelText: "Radius",
+                    selectOptions: [
+                        {
+                            text: "5 Km",
+                            value: 5
+                        },
+                        {
+                            text: "10 Km",
+                            value: 10
+                        },
+                        {
+                            text: "15 Km",
+                            value: 15
+                        },
+                        {
+                            text: "50 Km",
+                            value: 50
+                        },
+                        {
+                            text: "100 Km",
+                            value: 100
+                        }
+                    ]
+                }
+            }
+        },
+        /**
+         * properties for CmdFormElement-component for search-button
+         */
+        cmdFormElementSearchButton: {
+            type: Object,
+            default() {
+                return {
+                    icon: {
+                        show: true,
+                        position: "before",
+                        iconClass: "icon-search"
+                    },
+                    text: "Search"
+                }
+            }
+        },
+        /**
+         * properties for CmdFakeSelect-component for filters
+         */
+        cmdFakeSelect: {
+            type: Object,
+            required: false
         }
     },
     computed: {
-        buttonText() {
-            if (this.results) {
-                return this.results + " Results"
+        searchValue1: {
+            get() {
+                return this.modelValueInput1
+            },
+            set(value) {
+                this.$emit("update:modelValueInput1", value)
+            }
+        },
+        searchValue2: {
+            get() {
+                return this.modelValueInput2
+            },
+            set(value) {
+                this.$emit("update:modelValueInput2", value)
+            }
+        },
+        radius: {
+            get() {
+                return this.modelValueRadius
+            },
+            set(value) {
+                this.$emit("update:modelValueRadius", value)
+            }
+        },
+        searchFilters: {
+            get() {
+                return this.modelValueSearchFilters
+            },
+            set(value) {
+                this.$emit("update:modelValueSearchFilters", value)
             }
-            return "Search"
         }
     },
     methods: {
+        onSearchButtonClick() {
+            this.$emit("search", {
+                searchValue1: this.searchValue1,
+                searchValue2: this.searchValue2,
+                searchFilters: this.searchFilters,
+                radius: this.radius
+            })
+        },
         getOptionName(option) {
-            for (let i = 0; i < this.listOfFilters.length; i++) {
-                if (option === this.listOfFilters[i].value) {
-                    return this.listOfFilters[i].text
+            for (let i = 0; i < this.cmdFakeSelect.selectData.length; i++) {
+                if (option === this.cmdFakeSelect.selectData[i].value) {
+                    return this.cmdFakeSelect.selectData[i].text
                 }
             }
             return null
         }
+    },
+    watch: {
+        cmdFormElementRadius: {
+            handler() {
+                if (this.cmdFormElementRadius?.selectOptions && this.cmdFormElementRadius?.selectOptions.length && this.modelValueRadius == null) {
+                    this.radius = this.cmdFormElementRadius.selectOptions[0].value
+                }
+            },
+            immediate: true,
+            deep: true
+        }
     }
 }
 </script>
 
 <style lang="scss">
+/* begin cmd-box-site-search ---------------------------------------------------------------------------------------- */
+@import '../assets/styles/variables';
 .cmd-box-site-search {
+    flex-wrap: nowrap;
+
     > a {
         [class*='icon'] {
             font-size: 1rem;
@@ -185,4 +360,11 @@ export default {
         align-self: flex-end;
     }
 }
+
+@media only screen and (max-width: $small-max-width) {
+    .cmd-box-site-search {
+        flex-wrap: nowrap;
+    }
+}
+/* end cmd-box-site-search ---------------------------------------------------------------------------------------- */
 </style>

package/src/components/CmdCompanyLogo.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="cmd-company-logo">
-        <a v-if="link.type === 'router'"  href="./" :title="link.tooltip">
-            <img :src="pathCurrentLogo" :alt="altText"/>
-        </a>
-        <router-link v-else to="./" :title="link.tooltip">
+        <router-link v-if="link.type === 'router'" :href="link.path" :title="link.tooltip">
             <img :src="pathCurrentLogo" :alt="altText"/>
         </router-link>
+        <a v-else :to="link.path" :title="link.tooltip">
+            <img :src="pathCurrentLogo" :alt="altText"/>
+        </a>
     </div>
 </template>
 
@@ -53,26 +53,51 @@ export default {
     },
     computed: {
         pathCurrentLogo() {
-            if (this.prefersColorScheme === 'light' || !this.pathDarkmodeLogo) {
+            if (this.prefersColorScheme === "light" || !this.pathDarkmodeLogo) {
                 return this.pathDefaultLogo
             }
             return this.pathDarkmodeLogo
         }
     },
     created() {
-        if (matchMedia('(prefers-color-scheme: light)').matches) {
-            this.prefersColorScheme = "light"
-        } else {
-            this.prefersColorScheme = "dark"
-        }
+        this.toggleColorScheme()
+
+        window.matchMedia("(prefers-color-scheme: light)").addEventListener("change", this.onColorSchemeChange)
 
-        window.matchMedia('(prefers-color-scheme: light)').addEventListener('change', e => {
-            this.prefersColorScheme = e.matches ? "light" : "dark"
-        });
+        /* observe if class changes in html-tag */
+        const htmlTag = document.querySelector("html")
+        this.$_observer = new MutationObserver(this.observeDom)
+        this.$_observer.observe(htmlTag, {attributes: true})
+    },
+    beforeUnmount() {
+        window.matchMedia("(prefers-color-scheme: light)").removeEventListener("change", this.onColorSchemeChange)
+        this.$_observer.disconnect()
     },
     methods: {
+        onColorSchemeChange(event) {
+            this.prefersColorScheme = event.matches ? "light" : "dark"
+        },
+        observeDom(mutationList) {
+            for(let i = 0; i < mutationList.length; i++) {
+                if(mutationList[i].type === 'attributes') {
+                    this.toggleColorScheme()
+                    break
+                }
+            }
+        },
         getRoute(language) {
             return getRoute(language)
+        },
+        toggleColorScheme() {
+            if (document.querySelector("html").classList.contains("light-mode")) {
+                this.prefersColorScheme = "light"
+            } else if(document.querySelector("html").classList.contains("dark-mode")) {
+                this.prefersColorScheme = "dark"
+            } else if (matchMedia("(prefers-color-scheme: light)").matches) {
+                this.prefersColorScheme = "light"
+            } else {
+                this.prefersColorScheme = "dark"
+            }
         }
     }
 }

package/src/components/CmdCookieDisclaimer.vue

@@ -22,14 +22,6 @@
                     >
                         <template v-slot:header>
                             <!-- begin CmdSwitchButton -->
-                            <CmdSwitchButton
-                                type="checkbox"
-                                :id="cookie.id"
-                                :labelText="cookie.labelText"
-                                v-model="cookie.checked"
-                                :status="cookie.status"
-                                disabled="disabled"
-                            />
                             <!-- end CmdSwitchButton -->
                         </template>
                         <template v-slot:body>
@@ -58,13 +50,6 @@
                     >
                         <template v-slot:header>
                             <!-- begin CmdSwitchButton -->
-                            <CmdSwitchButton
-                                type="checkbox"
-                                :id="cookie.id"
-                                :labelText="cookie.labelText"
-                                v-model="cookie.checked"
-                                :status="cookie.status"
-                            />
                             <!-- end CmdSwitchButton -->
                         </template>
                         <template v-slot:body>
@@ -107,14 +92,12 @@
 // import components
 import CmdBox from "./CmdBox"
 import CmdCustomHeadline from "./CmdCustomHeadline"
-import CmdSwitchButton from "./CmdSwitchButton"
 
 export default {
     name: "CmdCookieDisclaimer",
     components: {
         CmdBox,
         CmdCustomHeadline,
-        CmdSwitchButton
     },
     data() {
         return {

package/src/components/CmdCustomHeadline.vue

@@ -1,5 +1,5 @@
 <template>
-    <header :class="['cmd-custom-headline', { 'has-pre-headline-text': preHeadlineText}]">
+    <div :class="['cmd-custom-headline', { 'has-pre-headline-text': preHeadlineText}]">
         <span v-if="iconClass" :class="iconClass"></span>
         <div v-if="preHeadlineText">
             <span class="pre-headline-text">{{ preHeadlineText }}</span>
@@ -10,7 +10,7 @@
         <component v-else :is="getHeadlineTag">
             <slot>{{ headlineText }}</slot>
         </component>
-    </header>
+    </div>
 </template>
 
 <script>
@@ -22,7 +22,7 @@ export default {
          */
         headlineText: {
             type: String,
-            required: true
+            required: false
         },
         /**
          * level for headline
@@ -74,7 +74,7 @@ export default {
         margin-bottom: 0;
     }
 
-    h1, h2, h3, h4, h5 ,h6 {
+    h1, h2, h3, h4, h5, h6 {
         margin: 0;
         display: flex;
         align-items: center;

package/src/components/CmdFakeSelect.vue

@@ -8,13 +8,13 @@
                 'has-state': validationStatus && validationStatus !== 'none'
             }
         ]"
-        :aria-labelledby="labelText"
+        :aria-labelledby="labelId"
         :aria-required="$attrs.required !== undefined"
         ref="fakeselect"
     >
         <span v-if="showLabel">
             <!-- begin label -->
-            <span>
+            <span :id="labelId">
                 {{ labelText }}<sup v-if="$attrs.required !== undefined">*</sup>
             </span>
             <!-- end label -->
@@ -29,7 +29,7 @@
                :role="validationStatus === 'error' ? 'alert' : 'dialog'">
             </a>
         </span>
-        <ul :class="{'open': showOptions}" @clickout="closeOptions">
+        <ul :class="{'open': showOptions}" @clickout="closeOptions" :aria-expanded="showOptions">
             <li>
                 <!-- begin default/selected-option -->
                 <a href="#" @click.prevent="toggleOptions" @blur="onBlur">
@@ -42,8 +42,8 @@
                 <!-- end default/selected-option-->
 
                 <!-- begin default dropdown (incl. optional icon) -->
-                <ul v-if="type === 'default' && showOptions" :aria-expanded="showOptions">
-                    <li v-for="(option, index) in selectData" :key="index" role="option">
+                <ul v-if="type === 'default' && showOptions" role="listbox">
+                    <li v-for="(option, index) in selectData" :key="index" role="option" :aria-selected="option.value === modelValue">
                         <!-- begin type 'href' -->
                         <a v-if="optionLinkType === 'href'" href="#" @click.prevent="selectOption(option.value)" :class="{'active' : option.value === modelValue}">
                             <span v-if="option.iconClass" :class="option.iconClass"></span>
@@ -149,6 +149,9 @@
 </template>
 
 <script>
+// import utils
+import {createUuid} from "../utils/common.js"
+
 // import mixins
 import I18n from "../mixins/I18n"
 import DefaultMessageProperties from "../mixins/CmdBox/DefaultMessageProperties"
@@ -327,6 +330,13 @@ export default {
         },
         selectAllOptionsIcon() {
             return "icon-check"
+        },
+        // get ID for accessibility
+        labelId() {
+            if(this.$attrs.id !== undefined) {
+                return this.$attrs.id
+            }
+            return "label-" + createUuid()
         }
     },
     mounted() {
@@ -465,7 +475,7 @@ export default {
         margin: 0;
         display: block;
         min-width: 0;
-        background: var(--pure-white);
+        background: var(--color-scheme-background-color);
         box-shadow: none;
         border-radius: var(--border-radius);
 
@@ -514,7 +524,7 @@ export default {
             padding-top: .8rem;
             outline: none;
             border-bottom: var(--default-border);
-            color: var(--text-color);
+            color: var(--color-scheme-text-color);
             text-decoration: none;
 
             &:hover, &:active, &:focus {