quasar-ui-danx 0.4.56 → 0.4.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.4.56",
+  "version": "0.4.57",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/ActionTable/Form/Fields/SelectionMenuField.vue

@@ -18,7 +18,7 @@
       >
         <div>
           <div
-            v-for="option in options"
+            v-for="option in optionsPlusSelected"
             :key="option.id"
             v-ripple
             class="cursor-pointer flex items-center relative"
@@ -104,7 +104,7 @@ import {
 	FaSolidListCheck as DefaultSelectIcon,
 	FaSolidPencil as EditIcon
 } from "danx-icon";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { ActionTargetItem } from "../../../../types";
 import { ShowHideButton } from "../../../Utility/Buttons";
 import { ActionButtonProps, default as ActionButton } from "../../../Utility/Buttons/ActionButton";
@@ -113,7 +113,7 @@ import EditableDiv from "./EditableDiv";
 defineEmits(["create", "update", "delete"]);
 const selected = defineModel<ActionTargetItem | null>("selected");
 const editing = defineModel<boolean>("editing");
-withDefaults(defineProps<{
+const props = withDefaults(defineProps<{
 	options: ActionTargetItem[];
 	showEdit?: boolean;
 	loading?: boolean;
@@ -153,4 +153,10 @@ withDefaults(defineProps<{
 });
 
 const isSelecting = ref(false);
+
+// If the selected option is not in the options list, it should be added in
+const optionsPlusSelected = computed(() => {
+	if (!selected.value || props.options.find((o) => o.id === selected.value?.id)) return props.options;
+	return [selected.value, ...props.options];
+});
 </script>

package/src/components/PanelsDrawer/PanelsDrawer.vue

@@ -46,6 +46,7 @@
           class="flex items-stretch flex-nowrap h-full"
         >
           <PanelsDrawerTabs
+            v-if="!hideTabs"
             :key="'pd-tabs:' + target.id"
             v-model="activePanel"
             :target="target"
@@ -53,13 +54,31 @@
             :panels="panels"
             @update:model-value="$emit('update:model-value', $event)"
           />
-          <PanelsDrawerPanels
+
+          <QTabPanels
             :key="'pd-panels:' + target.id"
-            :panels="panels"
-            :active-panel="activePanel"
-            :active-item="target"
+            :model-value="activePanel"
             :class="activePanelOptions?.class || panelsClass"
-          />
+            class="dx-panels-drawer-panels overflow-y-auto h-full transition-all"
+          >
+            <slot
+              name="panels"
+              :active-panel="activePanel"
+            >
+              <QTabPanel
+                v-for="panel in panels"
+                :key="panel.name"
+                :name="panel.name"
+              >
+                <RenderVnode
+                  v-if="panel.vnode"
+                  :vnode="panel.vnode"
+                  :props="target"
+                />
+              </QTabPanel>
+            </slot>
+          </QTabPanels>
+
           <div
             v-if="$slots['right-sidebar']"
             class="border-l overflow-y-auto"
@@ -81,8 +100,7 @@
 import { computed, onMounted, ref, watch } from "vue";
 import { XIcon as CloseIcon } from "../../svg";
 import { ActionPanel, ActionTargetItem } from "../../types";
-import { ContentDrawer } from "../Utility";
-import PanelsDrawerPanels from "./PanelsDrawerPanels";
+import { ContentDrawer, RenderVnode } from "../Utility";
 import PanelsDrawerTabs from "./PanelsDrawerTabs";
 
 export interface PanelsDrawerProps {
@@ -93,7 +111,8 @@ export interface PanelsDrawerProps {
 	panelsClass?: string | object,
 	drawerClass?: string | object,
 	position?: "standard" | "right" | "left";
-	panels: ActionPanel[]
+	panels: ActionPanel[];
+	hideTabs?: boolean;
 }
 
 defineEmits(["update:model-value", "close"]);

package/src/components/PanelsDrawer/index.ts

@@ -1,3 +1,2 @@
 export { default as PanelsDrawer } from "./PanelsDrawer.vue";
-export { default as PanelsDrawerPanels } from "./PanelsDrawerPanels.vue";
 export { default as PanelsDrawerTabs } from "./PanelsDrawerTabs.vue";

package/src/components/Utility/Buttons/ActionButton.vue

@@ -25,6 +25,7 @@
     <QTooltip
       v-if="tooltip"
       class="whitespace-nowrap"
+      :class="tooltipClass"
     >
       <slot name="tooltip">
         {{ tooltip }}
@@ -89,6 +90,7 @@ export interface ActionButtonProps {
 	disabledClass?: string;
 	confirm?: boolean;
 	confirmText?: string;
+	tooltipClass?: string;
 }
 
 const emit = defineEmits(["success", "error", "always"]);
@@ -105,7 +107,8 @@ const props = withDefaults(defineProps<ActionButtonProps>(), {
 	target: null,
 	input: null,
 	confirmText: "Are you sure?",
-	disabledClass: "text-slate-800 bg-slate-500 opacity-50"
+	disabledClass: "text-slate-800 bg-slate-500 opacity-50",
+	tooltipClass: ""
 });
 
 const mappedSizeClass = {

package/src/styles/quasar-reset.scss

@@ -87,10 +87,6 @@
 		&.scroll {
 			overflow: auto;
 		}
-
-		.q-tab-panel {
-			padding: 0;
-		}
 	}
 
 	&.overflow-y-auto {

package/src/components/PanelsDrawer/PanelsDrawerPanels.vue

@@ -1,29 +0,0 @@
-<template>
-  <QTabPanels
-    :model-value="activePanel"
-    class="dx-panels-drawer-panels overflow-y-auto h-full transition-all"
-  >
-    <QTabPanel
-      v-for="panel in panels"
-      :key="panel.name"
-      :name="panel.name"
-    >
-      <RenderVnode
-        v-if="panel.vnode"
-        :vnode="panel.vnode"
-        :props="activeItem"
-      />
-    </QTabPanel>
-  </QTabPanels>
-</template>
-
-<script setup lang="ts">
-import { ActionPanel, ActionTargetItem } from "../../types";
-import { RenderVnode } from "../Utility";
-
-defineProps<{
-	activePanel?: string | number,
-	activeItem: ActionTargetItem,
-	panels: ActionPanel[]
-}>();
-</script>