Merge pull request #4682 from nextcloud/fix/smartpicker-order

nextcloud · Aug 18, 2023 · e307c8b · e307c8b
2 parents 0a2b0d8 + 523e5f4
commit e307c8b
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Suggestion/LinkPicker/suggestions.js b/src/components/Suggestion/LinkPicker/suggestions.js
@@ -79,12 +79,6 @@ export default () => createSuggestions({
 	},
 	items: ({ editor, query }) => {
 		return [
-			...formattingSuggestions(query)
-				.filter(({ action, isActive }) => {
-					const canRunState = action(editor?.can())
-					const isActiveState = isActive && getIsActive({ isActive }, editor)
-					return canRunState && !isActiveState
-				}),
 			...searchProvider(query)
 				.map(p => {
 					return {
@@ -94,6 +88,12 @@ export default () => createSuggestions({
 						providerId: p.id,
 					}
 				}),
+			...formattingSuggestions(query)
+				.filter(({ action, isActive }) => {
+					const canRunState = action(editor?.can())
+					const isActiveState = isActive && getIsActive({ isActive }, editor)
+					return canRunState && !isActiveState
+				}),
 		]
 	},
 })