@vcmap/ui 6.0.0-rc.1 → 6.0.0-rc.3

package/src/legend/VcsLegend.vue

@@ -6,51 +6,37 @@
       v-if="entries.length > 0"
       class="rounded-0"
     >
-      <v-expansion-panel
+      <vcs-expansion-panel
         v-for="(entry, i) in entries"
         :key="i"
-        class="px-2"
+        :heading="entry.title"
+        :header-actions="entry.actions"
         @group:selected="entry.open = !entry.open"
       >
-        <v-expansion-panel-title hide-actions>
-          <template #default="{ open }">
-            <div class="d-flex justify-space-between">
-              <div class="d-flex align-center">
-                <v-icon class="mr-1" :class="{ rotate: !open }">
-                  mdi-chevron-down
-                </v-icon>
-                {{ $st(entry.title) }}
-              </div>
-              <VcsActionButtonList :actions="entry.actions" />
+        <v-list class="pl-6 pb-2">
+          <div v-for="(item, idx) in entry.legend" :key="idx">
+            <div v-if="item.type === LegendType.Image">
+              <img
+                :src="$st(item.src)"
+                :alt="item.src"
+                class="legend-image"
+                :title="item.tooltip"
+              />
             </div>
-          </template>
-        </v-expansion-panel-title>
-        <v-expansion-panel-text class="pl-6 pb-2">
-          <v-list density="compact">
-            <div v-for="(item, idx) in entry.legend" :key="idx">
-              <div v-if="item.type === LegendType.Image">
-                <img
-                  :src="$st(item.src)"
-                  :alt="item.src"
-                  class="legend-image"
-                  :title="item.tooltip"
-                />
-              </div>
-              <div v-else-if="item.type === LegendType.Iframe">
-                <iframe
-                  :id="`legendIframe${idx}`"
-                  :src="$st(item.src)"
-                  scrolling="no"
-                  style="width: 100%; height: 100%"
-                  frameBorder="0"
-                  @load="setIframeHeight(`legendIframe${idx}`)"
-                />
-              </div>
-              <style-legend-item v-else :item="item" />
+            <div v-else-if="item.type === LegendType.Iframe">
+              <iframe
+                :id="`legendIframe${idx}`"
+                :src="$st(item.src)"
+                scrolling="no"
+                style="width: 100%; height: 100%"
+                frameBorder="0"
+                @load="setIframeHeight(`legendIframe${idx}`)"
+              />
             </div>
-          </v-list>
-        </v-expansion-panel-text>
-      </v-expansion-panel>
+            <style-legend-item v-else :item="item" />
+          </div>
+        </v-list>
+      </vcs-expansion-panel>
     </v-expansion-panels>
     <v-sheet v-else class="ma-2">
       {{ $t('legend.empty') }}
@@ -59,19 +45,11 @@
 </template>
 
 <script>
-  import {
-    VExpansionPanels,
-    VExpansionPanel,
-    VExpansionPanelText,
-    VExpansionPanelTitle,
-    VIcon,
-    VList,
-    VSheet,
-  } from 'vuetify/components';
+  import { VExpansionPanels, VList, VSheet } from 'vuetify/components';
   import { computed } from 'vue';
   import { LegendType } from './legendHelper.js';
   import StyleLegendItem from './StyleLegendItem.vue';
-  import VcsActionButtonList from '../components/buttons/VcsActionButtonList.vue';
+  import VcsExpansionPanel from '../components/section/VcsExpansionPanel.vue';
 
   /**
    * @description A component rendering configured legend information for active layers.
@@ -81,13 +59,9 @@
   export default {
     name: 'VcsLegend',
     components: {
-      VcsActionButtonList,
+      VcsExpansionPanel,
       StyleLegendItem,
       VExpansionPanels,
-      VExpansionPanel,
-      VExpansionPanelText,
-      VExpansionPanelTitle,
-      VIcon,
       VList,
       VSheet,
     },

package/src/manager/buttonManager.js

@@ -1,7 +1,7 @@
 import { reactive } from 'vue';
 import { VcsEvent } from '@vcmap/core';
 import { v4 as uuidv4 } from 'uuid';
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, oneOf } from '@vcsuite/check';
 import { vcsAppSymbol } from '../pluginHelper.js';
 import { ActionPattern } from '../components/lists/VcsActionList.vue';
 import { getActionFromOptions } from '../actions/actionHelper.js';
@@ -101,10 +101,10 @@ class ButtonManager {
    * @returns {ButtonComponent}
    */
   add(buttonComponentOptions, owner) {
-    checkMaybe(buttonComponentOptions.id, String);
-    checkMaybe(buttonComponentOptions.weight, Number);
+    check(buttonComponentOptions.id, maybe(String));
+    check(buttonComponentOptions.weight, maybe(Number));
     check(buttonComponentOptions.action, ActionPattern);
-    check(owner, [String, vcsAppSymbol]);
+    check(owner, oneOf(String, vcsAppSymbol));
 
     if (buttonComponentOptions.id && this.has(buttonComponentOptions.id)) {
       throw new Error(

package/src/manager/collectionManager/CollectionComponent.vue

@@ -1,39 +1,24 @@
 <template>
-  <v-expansion-panel>
-    <v-expansion-panel-title hide-actions class="px-2">
-      <div class="d-flex justify-space-between">
-        <div class="d-flex align-center gc-1">
-          <v-icon :class="{ rotate: !open }"> mdi-chevron-down </v-icon>
-          <span>
-            {{ $st(title) }}
-          </span>
-          <span v-if="selectable && selection.length > 0">
-            {{ `(${selection.length})` }}
-          </span>
-        </div>
-        <VcsActionButtonList
-          v-if="actions?.length > 0"
-          :actions="actions"
-          :overflow-count="overflowCount"
-        />
-      </div>
-    </v-expansion-panel-title>
-    <v-expansion-panel-text class="pb-1">
+  <vcs-expansion-panel
+    :heading="title"
+    :header-actions="actions"
+    :action-button-list-overflow-count="overflowCount"
+  >
+    <template #header-append>
+      <span v-if="selectable && selection.length > 0" class="ml-1">
+        {{ `(${selection.length})` }}
+      </span>
+    </template>
+    <template #default>
       <CollectionComponentContent @openList="(id) => $emit('openList', id)" />
-    </v-expansion-panel-text>
-  </v-expansion-panel>
+    </template>
+  </vcs-expansion-panel>
 </template>
 
 <script>
   import { computed, inject } from 'vue';
-  import {
-    VIcon,
-    VExpansionPanel,
-    VExpansionPanelTitle,
-    VExpansionPanelText,
-  } from 'vuetify/components';
+  import VcsExpansionPanel from '../../components/section/VcsExpansionPanel.vue';
   import { createSelectionActions } from '../../components/lists/VcsList.vue';
-  import VcsActionButtonList from '../../components/buttons/VcsActionButtonList.vue';
   import CollectionComponentContent from './CollectionComponentContent.vue';
 
   /**
@@ -51,12 +36,8 @@
   export default {
     name: 'CollectionComponent',
     components: {
+      VcsExpansionPanel,
       CollectionComponentContent,
-      VcsActionButtonList,
-      VExpansionPanel,
-      VExpansionPanelTitle,
-      VExpansionPanelText,
-      VIcon,
     },
     props: {
       open: {
@@ -64,6 +45,7 @@
         default: false,
       },
     },
+    emits: ['openList'],
     setup(_props, { emit }) {
       /**
        * @type {CollectionComponentClass}
@@ -97,11 +79,4 @@
   };
 </script>
 
-<style lang="scss" scoped>
-  .rotate {
-    transform: rotate(-90deg);
-  }
-  .v-icon {
-    font-size: 16px;
-  }
-</style>
+<style lang="scss" scoped></style>

package/src/manager/collectionManager/CollectionComponent.vue.d.ts

@@ -9,12 +9,14 @@ declare const _default: import("vue").DefineComponent<{
     selectable: any;
     overflowCount: any;
     actions: import("vue").ComputedRef<any>;
-}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "openList"[], "openList", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     open: {
         type: BooleanConstructor;
         default: boolean;
     };
-}>>, {
+}>> & {
+    onOpenList?: ((...args: any[]) => any) | undefined;
+}, {
     open: boolean;
 }, {}>;
 export default _default;

package/src/manager/collectionManager/CollectionComponentContent.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-container class="py-0 px-0">
+  <v-container class="py-0 px-0 collection-component-content">
     <vcs-list
       :items="items.slice(0, limit)"
       :draggable="draggable"
@@ -36,13 +36,14 @@
    * @vue-event {string} openList
    */
   export default {
-    name: 'CollectionComponent',
+    name: 'CollectionComponentContent',
     components: {
       VcsButton,
       VcsList,
       VSheet,
       VContainer,
     },
+    emits: ['openList'],
     setup(_props, { emit }) {
       /**
        * @type {CollectionComponentClass}
@@ -89,12 +90,12 @@
 <style lang="scss" scoped>
   :deep(.v-list) {
     .v-list-item {
-      padding: 4px 8px 4px 28px;
+      padding-left: 24px;
+      padding-inline-start: 24px !important;
     }
     .v-list-item__selected {
-      border-left: solid 4px;
-      border-left-color: var(--v-primary-base);
-      padding-left: 24px !important;
+      padding-left: 20px !important;
+      padding-inline-start: 20px !important;
     }
   }
 </style>

package/src/manager/collectionManager/CollectionComponentContent.vue.d.ts

@@ -13,5 +13,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         targetIndex: any;
     }): void;
     openCollectionComponentList(): void;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "openList"[], "openList", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>> & {
+    onOpenList?: ((...args: any[]) => any) | undefined;
+}, {}, {}>;
 export default _default;

package/src/manager/collectionManager/CollectionComponentList.vue

@@ -1,11 +1,8 @@
 <template>
-  <div>
-    <div
-      v-if="!hideHeader"
-      class="v-expansion-panel-header px-2 v-expansion-panel-header--active"
-    >
-      <div class="d-flex justify-space-between">
-        <div class="d-flex align-center gc-1 pl-2">
+  <div class="collection-component-list">
+    <div v-if="!hideHeader" class="pr-2 pl-4 py-1">
+      <div class="d-flex justify-space-between inner-header">
+        <div class="d-flex align-center gc-1">
           <span>
             {{ $st(title) }}
           </span>
@@ -93,6 +90,7 @@
       VcsList,
       VSheet,
     },
+    emits: ['closeList'],
     setup(_props, { emit }) {
       /**
        * @type {import("./collectionComponentClass.js").CollectionComponentClass}
@@ -136,4 +134,8 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  .inner-header {
+    height: calc(var(--v-vcs-item-height) - 8px);
+  }
+</style>

package/src/manager/collectionManager/CollectionComponentList.vue.d.ts

@@ -31,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
         targetIndex: any;
     }): void;
     closeList(): void;
-}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closeList"[], "closeList", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     showLessButton: {
         type: BooleanConstructor;
         default: boolean;
@@ -40,7 +40,9 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}>>, {
+}>> & {
+    onCloseList?: ((...args: any[]) => any) | undefined;
+}, {
     hideHeader: boolean;
     showLessButton: boolean;
 }, {}>;

package/src/manager/collectionManager/CollectionComponentProvider.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="w-100">
+  <div class="w-100 collection-component-provider">
     <slot>
       <collection-component />
     </slot>

package/src/manager/collectionManager/CollectionComponentStandalone.vue

@@ -4,6 +4,7 @@
     :header-actions="actions"
     :action-button-list-overflow-count="overflowCount"
     v-bind="{ ...$attrs }"
+    class="collection-component-standalone"
   >
     <collection-component-list
       v-if="componentListView"
@@ -16,7 +17,7 @@
 
 <script>
   import { computed, getCurrentInstance, inject, ref } from 'vue';
-  import VcsFormSection from '../../components/form-inputs-controls/VcsFormSection.vue';
+  import VcsFormSection from '../../components/section/VcsFormSection.vue';
   import { createSelectionActions } from '../../components/lists/VcsList.vue';
   import CollectionComponentList from './CollectionComponentList.vue';
   import CollectionComponentContent from './CollectionComponentContent.vue';
@@ -27,7 +28,7 @@
    * The collectionComponent must be passed via {@link https://vuejs.org/api/composition-api-dependency-injection.html |provide }.
    */
   export default {
-    name: 'CollectionComponent',
+    name: 'CollectionComponentStandalone',
     components: {
       CollectionComponentList,
       CollectionComponentContent,

package/src/manager/collectionManager/CollectionManager.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-container class="pa-0">
+  <v-container class="pa-0 collection-manager">
     <v-expansion-panels
       variant="accordion"
       multiple

package/src/manager/collectionManager/collectionComponentClass.js

@@ -3,13 +3,12 @@ import { getLogger } from '@vcsuite/logger';
 import { v4 as uuidv4 } from 'uuid';
 import { computed, ref, shallowRef, watch } from 'vue';
 import { parseBoolean, parseNumber } from '@vcsuite/parsers';
-import { check } from '@vcsuite/check';
+import { check, oneOf } from '@vcsuite/check';
 import { validateAction } from '../../components/lists/VcsActionList.vue';
 import { sortByWeight } from '../buttonManager.js';
 import {
   createListItemBulkAction,
   createListItemDeleteAction,
-  createListItemRenameAction,
 } from '../../actions/listActions.js';
 import { sortByOwner } from '../navbarManager.js';
 
@@ -56,7 +55,7 @@ function destroyListItem(listItem) {
 /**
  * Renames the title of an item for VcsObject based items.
  * @param {import("@vcmap/core").VcsObject} item
- * @param {import("../../components/lists/VcsList").VcsListItem} listItem
+ * @param {import("../../components/lists/VcsList.vue").VcsListItem} listItem
  * @param {string} newTitle
  */
 function titleChanged(item, listItem, newTitle) {
@@ -77,7 +76,7 @@ export function createSupportedMapMappingFunction(
   supportedMaps,
   mapCollection,
 ) {
-  check(supportedMaps, [[String], Function]);
+  check(supportedMaps, oneOf([String], Function));
 
   return (item, _c, listItem) => {
     const mapNames =
@@ -359,11 +358,9 @@ class CollectionComponentClass {
       destroyFunctions: [],
     };
     if (this.renamable.value) {
-      listItem.actions.push(
-        createListItemRenameAction(listItem, {
-          name: this._actionTitles.renameTitle,
-        }),
-      );
+      listItem.renamable = {
+        name: this._actionTitles.renameTitle,
+      };
       listItem.titleChanged = (newTitle) =>
         titleChanged(item, listItem, newTitle);
     }

package/src/manager/collectionManager/collectionManager.js

@@ -1,6 +1,6 @@
 import { VcsEvent, Collection } from '@vcmap/core';
 import { reactive } from 'vue';
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, oneOf } from '@vcsuite/check';
 import { validateActions } from '../../components/lists/VcsActionList.vue';
 import CollectionComponentClass from './collectionComponentClass.js';
 
@@ -133,7 +133,7 @@ class CollectionManager {
    */
   add(collectionComponentOptions, owner) {
     check(collectionComponentOptions, { collection: Collection });
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
 
     if (
       collectionComponentOptions.id &&
@@ -220,9 +220,9 @@ class CollectionManager {
     owner,
     collectionComponentIds = [],
   ) {
-    checkMaybe(predicate, Function);
+    check(predicate, maybe(Function));
     check(mappingFunction, Function);
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
     check(collectionComponentIds, [String]);
 
     /** @type {ItemMapping} */
@@ -260,7 +260,7 @@ class CollectionManager {
    */
   removeMappingFunction(mappingFunction, owner) {
     check(mappingFunction, Function);
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
 
     [...this._collectionComponents.values()].forEach((collectionComponent) => {
       collectionComponent.removeItemMapping({ mappingFunction, owner });
@@ -279,7 +279,7 @@ class CollectionManager {
    */
   addFilterFunction(filterFunction, owner, collectionComponentIds = []) {
     check(filterFunction, Function);
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
     check(collectionComponentIds, [String]);
 
     /** @type {ItemFilter} */
@@ -316,7 +316,7 @@ class CollectionManager {
    */
   removeFilterFunction(filterFunction, owner) {
     check(filterFunction, Function);
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
 
     [...this._collectionComponents.values()].forEach((collectionComponent) => {
       collectionComponent.removeItemFilter({ filterFunction, owner });
@@ -334,7 +334,7 @@ class CollectionManager {
    * @param {Array<string>} [collectionComponentIds] list of collectionComponents this mappingFunction should be used on. If empty, actions are applied to all managed collectionComponents.
    */
   addActions(actions, owner, collectionComponentIds = []) {
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
     check(collectionComponentIds, [String]);
 
     if (!validateActions(actions)) {
@@ -367,7 +367,7 @@ class CollectionManager {
    * @param {string | symbol} owner
    */
   removeActions(actions, owner) {
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
 
     const idx = this._itemActions.findIndex((a) => a.actions === actions);
     if (idx > -1) {
@@ -386,7 +386,7 @@ class CollectionManager {
    * @param {string | symbol} owner
    */
   removeOwner(owner) {
-    check(owner, [String, Symbol]);
+    check(owner, oneOf(String, Symbol));
 
     [...this._collectionComponents.values()].forEach((collectionComponent) => {
       if (collectionComponent.owner === owner) {

package/src/manager/collectionManager/editorCollectionComponentClass.js

@@ -1,5 +1,5 @@
 import { nextTick, reactive, watch } from 'vue';
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, oneOf } from '@vcsuite/check';
 import { WindowSlot } from '../window/windowManager.js';
 import CollectionComponentClass from './collectionComponentClass.js';
 import { createListEditAction } from '../../actions/listActions.js';
@@ -65,9 +65,9 @@ export function makeEditorCollectionComponentClass(
   parentId = 'category-manager',
 ) {
   check(collectionComponent, CollectionComponentClass);
-  check(editingOptions.editor, [Object, Function]);
-  checkMaybe(editingOptions.multiEditor, Object);
-  checkMaybe(editingOptions.predicate, Function);
+  check(editingOptions.editor, oneOf(Object, Function));
+  check(editingOptions.multiEditor, maybe(Object));
+  check(editingOptions.predicate, maybe(Function));
 
   const editorCollectionComponent =
     /** @type {EditorCollectionComponentClass} */ collectionComponent;

package/src/manager/contextMenu/contextMenuManager.js

@@ -1,6 +1,6 @@
 import { CesiumMap, BaseOLMap, VcsEvent } from '@vcmap/core';
 import { unByKey } from 'ol/Observable.js';
-import { check } from '@vcsuite/check';
+import { check, oneOf } from '@vcsuite/check';
 import ContextMenuInteraction from './contextMenuInteraction.js';
 import { vcsAppSymbol } from '../../pluginHelper.js';
 import { validateAction } from '../../components/lists/VcsActionList.vue';
@@ -176,7 +176,7 @@ class ContextMenuManager {
    */
   addEventHandler(handler, owner) {
     check(handler, Function);
-    check(owner, [String, vcsAppSymbol]);
+    check(owner, oneOf(String, vcsAppSymbol));
 
     this._ensureInteraction();
     this._eventHandlers.push({ owner, handler });

package/src/manager/navbarManager.js

@@ -1,4 +1,4 @@
-import { check } from '@vcsuite/check';
+import { check, ofEnum } from '@vcsuite/check';
 import ButtonManager, { sortByWeight } from './buttonManager.js';
 import { vcsAppSymbol } from '../pluginHelper.js';
 
@@ -89,7 +89,7 @@ class NavbarManager extends ButtonManager {
    * @returns {import("./buttonManager.js").ButtonComponent}
    */
   add(buttonComponentOptions, owner, location) {
-    check(location, Object.values(ButtonLocation));
+    check(location, ofEnum(ButtonLocation));
     const buttonComponent = super.add(buttonComponentOptions, owner);
     buttonComponent[locationSymbol] = location;
     return buttonComponent;

package/src/manager/panel/panelManager.js

@@ -1,6 +1,6 @@
 import { reactive } from 'vue';
 import { VcsEvent } from '@vcmap/core';
-import { check } from '@vcsuite/check';
+import { check, ofEnum, oneOf } from '@vcsuite/check';
 import { v4 as uuidv4 } from 'uuid';
 import { parseBoolean } from '@vcsuite/parsers';
 import { vcsAppSymbol } from '../../pluginHelper.js';
@@ -279,8 +279,8 @@ class PanelManager {
    * @returns {PanelComponent}
    */
   add(panelComponentOptions, owner, location) {
-    check(owner, [String, vcsAppSymbol]);
-    check(location, Object.values(PanelLocation));
+    check(owner, oneOf(String, vcsAppSymbol));
+    check(location, ofEnum(PanelLocation));
 
     const id = panelComponentOptions.id || uuidv4();
     const { component, position: panelPosition } = panelComponentOptions;

package/src/manager/toolbox/toolboxManager.js

@@ -1,5 +1,5 @@
 import { VcsEvent } from '@vcmap/core';
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, ofEnum, oneOf, optional } from '@vcsuite/check';
 import { v4 as uuidv4 } from 'uuid';
 import { reactive, shallowReactive } from 'vue';
 import { vcsAppSymbol } from '../../pluginHelper.js';
@@ -230,7 +230,7 @@ class ToolboxManager {
   }
 
   set toolboxName(name) {
-    check(name, [String, defaultToolboxName]);
+    check(name, oneOf(String, defaultToolboxName));
 
     if (this._toolboxName !== name) {
       this._toolboxName = name;
@@ -285,9 +285,9 @@ class ToolboxManager {
    * @returns {SingleToolboxComponent|SelectToolboxComponent|import("vue").ShallowReactive<GroupToolboxComponent>}
    */
   add(toolboxComponentOptions, owner) {
-    checkMaybe(toolboxComponentOptions.id, String);
-    check(toolboxComponentOptions.type, Object.values(ToolboxType));
-    check(owner, [String, vcsAppSymbol]);
+    check(toolboxComponentOptions.id, maybe(String));
+    check(toolboxComponentOptions.type, ofEnum(ToolboxType));
+    check(owner, oneOf(String, vcsAppSymbol));
 
     if (toolboxComponentOptions.id && this.has(toolboxComponentOptions.id)) {
       throw new Error(
@@ -335,13 +335,13 @@ class ToolboxManager {
         ...ActionPattern,
         selected: Function,
         currentIndex: Number,
-        disabled: [undefined, Boolean],
+        disabled: optional(Boolean),
         tools: [
           {
             name: String,
-            title: [undefined, String],
+            title: optional(String),
             icon: String,
-            disabled: [undefined, Boolean],
+            disabled: optional(Boolean),
           },
         ],
       });
@@ -357,8 +357,8 @@ class ToolboxManager {
       };
     } else {
       check(toolboxComponentOptions.icon, String);
-      checkMaybe(toolboxComponentOptions.title, String);
-      checkMaybe(toolboxComponentOptions.disabled, Boolean);
+      check(toolboxComponentOptions.title, maybe(String));
+      check(toolboxComponentOptions.disabled, maybe(Boolean));
       const {
         icon,
         title = undefined,