From b683066c8321bf5855dc6fea87f6aaff76dd3184 Mon Sep 17 00:00:00 2001
From: Dan Popescu <pdan.popescu@gmail.com>
Date: Sat, 11 Sep 2021 19:08:59 +0300
Subject: [PATCH] feat(QFab): add scoped slots for icon, icon-active and label
 #7689

#7689
---
 docs/src/examples/QFab/FabSlots.vue           | 67 +++++++++++++++++++
 .../vue-components/floating-action-button.md  |  6 ++
 ui/dev/src/pages/components/fab.vue           | 57 +++++++++++++++-
 ui/src/components/fab/QFab.js                 | 31 ++++++---
 ui/src/components/fab/QFab.json               | 35 ++++++++++
 ui/src/components/fab/QFabAction.js           | 25 ++++---
 ui/src/components/fab/QFabAction.json         | 10 +++
 7 files changed, 208 insertions(+), 23 deletions(-)
 create mode 100644 docs/src/examples/QFab/FabSlots.vue

diff --git a/docs/src/examples/QFab/FabSlots.vue b/docs/src/examples/QFab/FabSlots.vue
new file mode 100644
index 00000000000..f29b67afff8
--- /dev/null
+++ b/docs/src/examples/QFab/FabSlots.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="q-px-sm q-py-lg">
+    <div class="column items-center" style="margin-top: 100px; margin-bottom: 100px;">
+      <q-fab color="purple" direction="up">
+        <template v-slot:icon="{ opened }">
+          <q-icon :class="{ 'example-fab-animate--hover': opened !== true }" name="keyboard_arrow_up" />
+        </template>
+
+        <template v-slot:active-icon="{ opened }">
+          <q-icon :class="{ 'example-fab-animate': opened === true }" name="close" />
+        </template>
+
+        <q-fab-action color="primary" external-label @click="onClick">
+          <template v-slot:icon>
+            <q-icon name="mail" />
+          </template>
+          <template v-slot:label>
+            Mail
+          </template>
+        </q-fab-action>
+
+        <q-fab-action color="secondary" external-label @click="onClick" icon="alarm" label="Alarm" />
+      </q-fab>
+
+      <br>
+
+      <q-fab color="amber" text-color="black" icon="keyboard_arrow_left" direction="left">
+        <template v-slot:label="{ opened }">
+          <div :class="{ 'example-fab-animate--hover': opened !== true }">
+            {{ opened !== true ? 'Open' : 'Close' }}
+          </div>
+        </template>
+
+        <q-fab-action color="primary" @click="onClick" icon="mail" />
+        <q-fab-action color="secondary" @click="onClick" icon="alarm" />
+      </q-fab>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    onClick () {
+      // console.log('Clicked on a fab action')
+    }
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.example-fab-animate,
+.q-fab:hover .example-fab-animate--hover
+  animation: example-fab-animate 0.82s cubic-bezier(.36,.07,.19,.97) both
+  transform: translate3d(0, 0, 0)
+  backface-visibility: hidden
+  perspective: 1000px
+@keyframes example-fab-animate
+  10%, 90%
+    transform: translate3d(-1px, 0, 0)
+  20%, 80%
+    transform: translate3d(2px, 0, 0)
+  30%, 50%, 70%
+    transform: translate3d(-4px, 0, 0)
+  40%, 60%
+    transform: translate3d(4px, 0, 0)
+</style>
diff --git a/docs/src/pages/vue-components/floating-action-button.md b/docs/src/pages/vue-components/floating-action-button.md
index 7ef1c02568c..62cc23a460e 100644
--- a/docs/src/pages/vue-components/floating-action-button.md
+++ b/docs/src/pages/vue-components/floating-action-button.md
@@ -68,6 +68,12 @@ The default padding for QFab is "md" and for QFabAction is "sm". However, you ca
 
 <doc-example title="Square style" file="QFab/SquareStyle" />
 
+### Slots <q-badge align="top" color="brand-primary" label="v1.17+" />
+
+Notice the slots for QFab and the slots for QFabAction below:
+
+<doc-example title="Slots: icon, active-icon and label" file="QFab/FabSlots" />
+
 ### With QPageSticky
 
 <doc-example title="With QPageSticky" file="QFab/PageSticky" />
diff --git a/ui/dev/src/pages/components/fab.vue b/ui/dev/src/pages/components/fab.vue
index 1d5e811427a..5f934506928 100644
--- a/ui/dev/src/pages/components/fab.vue
+++ b/ui/dev/src/pages/components/fab.vue
@@ -73,9 +73,42 @@
         </q-fab-action>
       </q-fab>
 
-      <div style="height: 1000px">
-&nbsp;
-      </div>
+      <q-fab
+        class="fixed-bottom"
+        style="right: auto; bottom: 18px; left: 50%; transform: translateX(-50%)"
+        direction="up"
+        color="primary"
+      >
+        <template #icon="{ opened }">
+          <q-icon :class="{ 'test-fab-animate--hover': opened !== true }" :name="mdiMenu" />
+        </template>
+        <template #active-icon="{ opened }">
+          <q-icon :class="{ 'test-fab-animate': opened === true }" name="close" />
+        </template>
+        <template #label="{ opened }">
+          <div :class="{ 'test-fab-animate--hover': opened === true }">Label</div>
+        </template>
+
+        <q-fab-action color="blue" class="white" external-label>
+          <template #icon>
+            <q-icon name="person_add" />
+          </template>
+          <template #label>
+            Label
+          </template>
+
+          <q-tooltip anchor="center left" self="center right" :offset="[20, 0]">
+            Add person
+          </q-tooltip>
+        </q-fab-action>
+        <q-fab-action color="blue" class="white" icon="group_add">
+          <q-tooltip anchor="center left" self="center right" :offset="[20, 0]">
+            Add group
+          </q-tooltip>
+        </q-fab-action>
+      </q-fab>
+
+      <div style="height: 1000px">&nbsp;</div>
 
       <div class="q-gutter-lg">
         <q-btn fab :icon="mdiMenu" />
@@ -110,6 +143,24 @@
   </div>
 </template>
 
+<style lang="sass">
+.test-fab-animate,
+.q-fab:hover .test-fab-animate--hover
+  animation: test-fab-animate 0.82s cubic-bezier(.36,.07,.19,.97) both
+  transform: translate3d(0, 0, 0)
+  backface-visibility: hidden
+  perspective: 1000px
+@keyframes test-fab-animate
+  10%, 90%
+    transform: translate3d(-1px, 0, 0)
+  20%, 80%
+    transform: translate3d(2px, 0, 0)
+  30%, 50%, 70%
+    transform: translate3d(-4px, 0, 0)
+  40%, 60%
+    transform: translate3d(4px, 0, 0)
+ </style>
+
 <script>
 import { mdiMenu } from '@quasar/extras/mdi-v4'
 
diff --git a/ui/src/components/fab/QFab.js b/ui/src/components/fab/QFab.js
index 9c41a99031d..4a3472de323 100644
--- a/ui/src/components/fab/QFab.js
+++ b/ui/src/components/fab/QFab.js
@@ -80,6 +80,10 @@ export default Vue.extend({
         'aria-haspopup': 'true',
         ...this.qAttrs
       }
+    },
+
+    slotScope () {
+      return { opened: this.showing }
     }
   },
 
@@ -90,6 +94,15 @@ export default Vue.extend({
       if (this.$refs.trigger && this.$refs.trigger.$el) {
         this.$refs.trigger.$el.focus()
       }
+    },
+
+    __getIcon (h, kebab, camel) {
+      const slotFn = this.$scopedSlots[kebab]
+      const staticClass = `q-fab__${kebab} absolute-full`
+
+      return slotFn === void 0
+        ? h(QIcon, { staticClass, props: { name: this[kebab] || this.$q.iconSet.fab[camel] } })
+        : h('div', { staticClass }, slotFn(this.slotScope))
     }
   },
 
@@ -98,20 +111,16 @@ export default Vue.extend({
 
     this.hideIcon !== true && child.push(
       h('div', { staticClass: 'q-fab__icon-holder', class: this.iconHolderClasses }, [
-        h(QIcon, {
-          staticClass: 'q-fab__icon absolute-full',
-          props: { name: this.icon || this.$q.iconSet.fab.icon }
-        }),
-        h(QIcon, {
-          staticClass: 'q-fab__active-icon absolute-full',
-          props: { name: this.activeIcon || this.$q.iconSet.fab.activeIcon }
-        })
+        this.__getIcon(h, 'icon', 'icon'),
+        this.__getIcon(h, 'active-icon', 'activeIcon')
       ])
     )
 
-    this.label !== '' && child[this.labelProps.action](
-      h('div', this.labelProps.data, [ this.label ])
-    )
+    if (this.label !== '' || this.$scopedSlots.label !== void 0) {
+      child[this.labelProps.action](
+        h('div', this.labelProps.data, this.$scopedSlots.label !== void 0 ? this.$scopedSlots.label(this.slotScope) : [ this.label ])
+      )
+    }
 
     return h('div', {
       staticClass: 'q-fab z-fab row inline justify-center',
diff --git a/ui/src/components/fab/QFab.json b/ui/src/components/fab/QFab.json
index c0c50c463ed..0e859587c71 100644
--- a/ui/src/components/fab/QFab.json
+++ b/ui/src/components/fab/QFab.json
@@ -57,6 +57,41 @@
     }
   },
 
+  "scopedSlots": {
+    "icon": {
+      "desc": "Slot for icon shown when FAB is closed; Suggestion: QIcon",
+      "scope": {
+        "opened": {
+          "type": "Boolean",
+          "desc": "FAB is opened"
+        }
+      },
+      "addedIn": "v1.17"
+    },
+
+    "active-icon": {
+      "desc": "Slot for icon shown when FAB is opened; Suggestion: QIcon",
+      "scope": {
+        "opened": {
+          "type": "Boolean",
+          "desc": "FAB is opened"
+        }
+      },
+      "addedIn": "v1.17"
+    },
+
+    "label": {
+      "desc": "Slot for label",
+      "scope": {
+        "opened": {
+          "type": "Boolean",
+          "desc": "FAB is opened"
+        }
+      },
+      "addedIn": "v1.17"
+    }
+  },
+
   "events": {
     "input": {
       "desc": "Emitted when fab actions are shown/hidden; Captured by v-model directive"
diff --git a/ui/src/components/fab/QFabAction.js b/ui/src/components/fab/QFabAction.js
index 5ab99ffe38f..67da53f78ea 100644
--- a/ui/src/components/fab/QFabAction.js
+++ b/ui/src/components/fab/QFabAction.js
@@ -75,15 +75,22 @@ export default Vue.extend({
   render (h) {
     const child = []
 
-    this.icon !== '' && child.push(
-      h(QIcon, {
-        props: { name: this.icon }
-      })
-    )
-
-    this.label !== '' && child[this.labelProps.action](
-      h('div', this.labelProps.data, [ this.label ])
-    )
+    if (this.$scopedSlots.icon !== void 0) {
+      child.push(this.$scopedSlots.icon())
+    }
+    else if (this.icon !== '') {
+      child.push(
+        h(QIcon, {
+          props: { name: this.icon }
+        })
+      )
+    }
+
+    if (this.label !== '' || this.$scopedSlots.label !== void 0) {
+      child[this.labelProps.action](
+        h('div', this.labelProps.data, this.$scopedSlots.label !== void 0 ? this.$scopedSlots.label() : [ this.label ])
+      )
+    }
 
     return h(QBtn, {
       class: this.classes,
diff --git a/ui/src/components/fab/QFabAction.json b/ui/src/components/fab/QFabAction.json
index 73689c2fb77..324c24c042a 100644
--- a/ui/src/components/fab/QFabAction.json
+++ b/ui/src/components/fab/QFabAction.json
@@ -36,6 +36,16 @@
   "slots": {
     "default": {
       "desc": "Suggestion for this slot: QTooltip"
+    },
+
+    "icon": {
+      "desc": "Slot for icon; Suggestion: QIcon",
+      "addedIn": "v1.17"
+    },
+
+    "label": {
+      "desc": "Slot for label",
+      "addedIn": "v1.17"
     }
   },