Merge pull request #525 from frappe/develop

frappe · Jan 9, 2025 · 2006ea3 · 2006ea3
2 parents 03ab34f + 6eefcfd
commit 2006ea3
Show file tree

Hide file tree

Showing 23 changed files with 431 additions and 442 deletions.
diff --git a/frappe-ui b/frappe-ui
diff --git a/frontend/package.json b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.99",
+    "frappe-ui": "^0.1.103",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",

diff --git a/frontend/src/components/Activities/DataFields.vue b/frontend/src/components/Activities/DataFields.vue
@@ -58,7 +58,7 @@
 <script setup>
 import EditIcon from '@/components/Icons/EditIcon.vue'
 import DataFieldsModal from '@/components/Modals/DataFieldsModal.vue'
-import FieldLayout from '@/components/FieldLayout.vue'
+import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import { Badge, createResource, createDocumentResource } from 'frappe-ui'
 import LoadingIndicator from '@/components/Icons/LoadingIndicator.vue'
 import { createToast } from '@/utils'

diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
@@ -51,7 +51,13 @@
       </div>
       <!-- Rows -->
       <template v-if="rows?.length">
-        <Draggable class="w-full" v-model="rows" group="rows" item-key="name">
+        <Draggable
+          class="w-full"
+          v-model="rows"
+          :delay="isTouchScreenDevice() ? 200 : 0"
+          group="rows"
+          item-key="name"
+        >
           <template #item="{ element: row, index }">
             <div
               class="grid-row flex cursor-pointer items-center border-b border-outline-gray-modals bg-surface-modals last:rounded-b last:border-b-0"
@@ -252,7 +258,7 @@ import GridRowModal from '@/components/Controls/GridRowModal.vue'
 import EditIcon from '@/components/Icons/EditIcon.vue'
 import Link from '@/components/Controls/Link.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { getRandom, getFormat } from '@/utils'
+import { getRandom, getFormat, isTouchScreenDevice } from '@/utils'
 import { usersStore } from '@/stores/users'
 import { getMeta } from '@/stores/meta'
 import {

diff --git a/frontend/src/components/Controls/GridRowFieldsModal.vue b/frontend/src/components/Controls/GridRowFieldsModal.vue
@@ -40,7 +40,6 @@
             v-else
             :tabs="tabs.data"
             :data="{}"
-            :modal="true"
             :preview="true"
           />
         </div>
@@ -49,7 +48,7 @@
   </Dialog>
 </template>
 <script setup>
-import FieldLayout from '@/components/FieldLayout.vue'
+import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import FieldLayoutEditor from '@/components/FieldLayoutEditor.vue'
 import { useDebounceFn } from '@vueuse/core'
 import { capture } from '@/telemetry'

diff --git a/frontend/src/components/Controls/GridRowModal.vue b/frontend/src/components/Controls/GridRowModal.vue
@@ -32,7 +32,7 @@
 
 <script setup>
 import EditIcon from '@/components/Icons/EditIcon.vue'
-import FieldLayout from '@/components/FieldLayout.vue'
+import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import { usersStore } from '@/stores/users'
 import { createResource } from 'frappe-ui'
 import { nextTick } from 'vue'
+2 −2		package.json
+5 −1		src/components/FormControl.vue
+19 −18		src/components/Tabs/TabList.vue
+2 −2		src/components/Tabs/TabPanel.vue
+9 −4		src/components/Tabs/Tabs.vue
+2 −0		src/components/TextInput.vue
+1 −1		src/data-fetching/useCall/useCall.test.ts
+12 −6		src/data-fetching/useCall/useCall.ts
+4 −3		src/data-fetching/useDoc/useDoc.ts
+7 −0		src/data-fetching/useDoctype/useDoctype.ts
+7 −8		src/data-fetching/useList/types.ts
+1 −1		src/data-fetching/useList/useList.test.ts
+40 −25		src/data-fetching/useList/useList.ts
+17 −1		src/data-fetching/useNewDoc/useNewDoc.ts
+1 −4		src/mocks/handlers.ts