From 970b2b3229a77637235c280878766d3d33659e22 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 8 Dec 2022 10:59:58 +0530
Subject: [PATCH] fix(gui): introduce infinite scroll to avoid delay in loading
 emoji list

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/dashboard/TreeView.vue    | 17 ++++++-----------
 .../nc-gui/components/general/EmojiIcons.vue    | 14 ++++++++++++--
 .../nc-gui/components/general/IconifyIcon.vue   |  7 -------
 packages/nc-gui/package-lock.json               | 11 +++++++++++
 packages/nc-gui/package.json                    |  1 +
 .../[projectType]/[projectId]/index/index.vue   |  3 ++-
 6 files changed, 32 insertions(+), 21 deletions(-)
 delete mode 100644 packages/nc-gui/components/general/IconifyIcon.vue

diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index 4fcd441e12..2d84d402df 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -3,6 +3,7 @@ import type { TableType } from 'nocodb-sdk'
 import type { Input } from 'ant-design-vue'
 import Sortable from 'sortablejs'
 import GithubButton from 'vue-github-button'
+import { Icon } from '@iconify/vue'
 import type { VNodeRef } from '#imports'
 import {
   ClientType,
@@ -27,7 +28,7 @@ import {
 import MdiView from '~icons/mdi/eye-circle-outline'
 import MdiTableLarge from '~icons/mdi/table-large'
 
-const { addTab , updateTab } = useTabs()
+const { addTab, updateTab } = useTabs()
 
 const { $api, $e } = useNuxtApp()
 
@@ -307,14 +308,12 @@ const setIcon = (icon: string, table: TableType) => {
   }
   tables.value.splice(tables.value.indexOf(table), 1, { ...table })
 
-
   updateTab({ id: table.id }, { meta: table.meta })
 
   $api.dbTable.update(table.id as string, {
     meta: table.meta,
   })
 }
-
 </script>
 
 <template>
@@ -568,20 +567,16 @@ const setIcon = (icon: string, table: TableType) => {
                         <div class="flex w-auto" :data-testid="`tree-view-table-draggable-handle-${table.title}`">
                           <a-dropdown trigger="click" @click.stop>
                             <div @click.stop>
-<!--                              <MdiDrag
+                              <!--                              <MdiDrag
                                 v-if="isUIAllowed('treeview-drag-n-drop')"
                                 :class="`nc-child-draggable-icon-${table.title}`"
                                 class="nc-drag-icon text-xs hidden group-hover:block transition-opacity opacity-0 group-hover:opacity-100 text-gray-500 cursor-move"
                                 @click.stop.prevent
-                              />-->
+                              /> -->
 
                               <a-tooltip>
                                 <span v-if="table.meta?.icon" :key="table.meta?.icon">
-                                  <GeneralIconifyIcon
-                                    :key="table.meta?.icon"
-                                    class="text-xl"
-                                    :icon="table.meta?.icon"
-                                  ></GeneralIconifyIcon>
+                                  <Icon :key="table.meta?.icon" class="text-xl" :icon="table.meta?.icon"></Icon>
                                 </span>
                                 <component
                                   :is="icon(table)"
@@ -594,7 +589,7 @@ const setIcon = (icon: string, table: TableType) => {
                               </a-tooltip>
                             </div>
                             <template #overlay>
-                              <LazyGeneralEmojiIcons class="shadow bg-white p-2" @select-icon="setIcon($event, table)" />
+                              <GeneralEmojiIcons class="shadow bg-white p-2" @select-icon="setIcon($event, table)" />
                             </template>
                           </a-dropdown>
 
diff --git a/packages/nc-gui/components/general/EmojiIcons.vue b/packages/nc-gui/components/general/EmojiIcons.vue
index 29d1b3c338..9608d63123 100644
--- a/packages/nc-gui/components/general/EmojiIcons.vue
+++ b/packages/nc-gui/components/general/EmojiIcons.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { Icon } from '@iconify/vue'
+import InfiniteLoading from 'v3-infinite-loading'
 
 const emit = defineEmits(['selectIcon'])
 const search = $ref('')
@@ -1842,15 +1843,23 @@ const icons = [
   'zzz',
 ]
 
+let toIndex = $ref(60)
 const filteredIcons = computed(() => {
-  return icons.filter((icon) => !search || icon.toLowerCase().includes(search.toLowerCase()))
+  return icons.filter((icon) => !search || icon.toLowerCase().includes(search.toLowerCase())).slice(0, toIndex)
 })
+
+const load = () => {
+  toIndex += Math.min(filteredIcons.value.length, toIndex + 60)
+  if (toIndex > filteredIcons.value.length) {
+    toIndex = filteredIcons.value.length
+  }
+}
 </script>
 
 <template>
   <div class="p-1 w-70 h-75 flex flex-col gap-1 justify-start">
     <div @click.stop>
-      <input v-model="search" class="p-1 border-1 w-full overflow-y-auto" placeholder="Search" />
+      <input v-model="search" class="p-1 border-1 w-full overflow-y-auto" placeholder="Search" @input="toIndex = 60" />
     </div>
     <div class="flex gap-1 flex-wrap w-full flex-shrink overflow-y-auto scrollbar-thin-dull">
       <div v-for="icon of filteredIcons" :key="icon" @click="emit('selectIcon', `emojione:${icon}`)">
@@ -1858,6 +1867,7 @@ const filteredIcons = computed(() => {
           <Icon class="text-xl iconify" :icon="`emojione:${icon}`"></Icon>
         </span>
       </div>
+      <InfiniteLoading @infinite="load"><span /></InfiniteLoading>
     </div>
   </div>
 </template>
diff --git a/packages/nc-gui/components/general/IconifyIcon.vue b/packages/nc-gui/components/general/IconifyIcon.vue
deleted file mode 100644
index b8589dda2e..0000000000
--- a/packages/nc-gui/components/general/IconifyIcon.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts" setup>
-import { Icon } from '@iconify/vue'
-</script>
-
-<template>
-  <Icon :icon="icon" />
-</template>
diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 5521ba43dc..f0711461de 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -35,6 +35,7 @@
         "sortablejs": "^1.15.0",
         "tinycolor2": "^1.4.2",
         "unique-names-generator": "^4.7.1",
+        "v3-infinite-loading": "^1.2.2",
         "validator": "^13.7.0",
         "vue-dompurify-html": "^3.0.0",
         "vue-github-button": "^3.0.3",
@@ -16190,6 +16191,11 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/v3-infinite-loading": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/v3-infinite-loading/-/v3-infinite-loading-1.2.2.tgz",
+      "integrity": "sha512-MWJc6yChnqeUasBFJ3Enu8IGPcQgRMSTrAEtT1MsHBEx+QjwvNTaY8o+8V9DgVt1MVhQSl3MC55hsaWLJmpRMw=="
+    },
     "node_modules/v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
@@ -29538,6 +29544,11 @@
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true
     },
+    "v3-infinite-loading": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/v3-infinite-loading/-/v3-infinite-loading-1.2.2.tgz",
+      "integrity": "sha512-MWJc6yChnqeUasBFJ3Enu8IGPcQgRMSTrAEtT1MsHBEx+QjwvNTaY8o+8V9DgVt1MVhQSl3MC55hsaWLJmpRMw=="
+    },
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index aebde1d385..927f80f41f 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -58,6 +58,7 @@
     "sortablejs": "^1.15.0",
     "tinycolor2": "^1.4.2",
     "unique-names-generator": "^4.7.1",
+    "v3-infinite-loading": "^1.2.2",
     "validator": "^13.7.0",
     "vue-dompurify-html": "^3.0.0",
     "vue-github-button": "^3.0.3",
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue
index 682e3ccae3..d43bf7be2f 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { Icon } from '@iconify/vue'
 import type { TabItem } from '~/lib'
 import { TabType } from '~/lib'
 import { TabMetaInj, iconMap, provide, useGlobal, useSidebar, useTabs } from '#imports'
@@ -48,7 +49,7 @@ function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
             <template #tab>
               <div class="flex items-center gap-2 max-w-[110px]">
                 <div class="flex items-center">
-                  <GeneralIconifyIcon v-if="tab.meta?.icon" :icon="tab.meta?.icon" class="text-xl" />
+                  <Icon v-if="tab.meta?.icon" :icon="tab.meta?.icon" class="text-xl" />
                   <component :is="icon(tab)" v-else class="text-sm" />
                 </div>