Regression: Fix slash commands (#28168)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
RocketChat · Feb 28, 2023 · 70320d4 · 70320d4
1 parent d00f7c5
commit 70320d4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 40 deletions.
diff --git a/...pp/ui-message/client/popup/components/composerBoxPopupPreview/ComposerBoxPopupPreview.tsx b/...pp/ui-message/client/popup/components/composerBoxPopupPreview/ComposerBoxPopupPreview.tsx
@@ -25,45 +25,44 @@ const ComposerBoxPopupPreview = forwardRef<
 	const executeSlashCommandPreviewMethod = useMethod('executeSlashCommandPreview');
 	useImperativeHandle(
 		ref,
-		() =>
-			suspended
-				? {}
-				: {
-						getFilter: () => {
-							const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
-							if (!value) {
-								throw new Error('No value');
-							}
-							const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);
-
-							if (!matches) {
-								throw new Error('No matches');
-							}
-
-							const cmd = matches[1].replace('/', '').trim().toLowerCase();
-
-							const params = matches[2];
-							return { cmd, params, msg: { rid, tmid } };
-						},
-						select: (item) => {
-							const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
-							if (!value) {
-								throw new Error('No value');
-							}
-							const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);
-
-							if (!matches) {
-								throw new Error('No matches');
-							}
-
-							const cmd = matches[1].replace('/', '').trim().toLowerCase();
-
-							const params = matches[2];
-							// TODO: Fix this solve the typing issue
-							executeSlashCommandPreviewMethod({ cmd, params, msg: { rid, tmid } }, { id: item._id, type: item.type, value: item.value });
-							chat?.composer?.setText('');
-						},
-				  },
+		() => ({
+			getFilter: () => {
+				const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
+				if (!value) {
+					throw new Error('No value');
+				}
+				const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);
+
+				if (!matches) {
+					throw new Error('No matches');
+				}
+
+				const cmd = matches[1].replace('/', '').trim().toLowerCase();
+
+				const params = matches[2];
+				return { cmd, params, msg: { rid, tmid } };
+			},
+			...(!suspended && {
+				select: (item) => {
+					const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
+					if (!value) {
+						throw new Error('No value');
+					}
+					const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);
+
+					if (!matches) {
+						throw new Error('No matches');
+					}
+
+					const cmd = matches[1].replace('/', '').trim().toLowerCase();
+
+					const params = matches[2];
+					// TODO: Fix this solve the typing issue
+					executeSlashCommandPreviewMethod({ cmd, params, msg: { rid, tmid } }, { id: item._id, type: item.type, value: item.value });
+					chat?.composer?.setText('');
+				},
+			}),
+		}),
 		[chat?.composer, executeSlashCommandPreviewMethod, rid, tmid, suspended],
 	);
 

diff --git a/apps/meteor/app/ui-message/client/popup/hooks/useComposerBoxPopup.ts b/apps/meteor/app/ui-message/client/popup/hooks/useComposerBoxPopup.ts
@@ -168,7 +168,7 @@ export const useComposerBoxPopup = <T extends { _id: string; sort?: number }>({
 	});
 
 	const keydown = useMutableCallback((event: KeyboardEvent) => {
-		if (!popup || popup.preview) {
+		if (!popup) {
 			return;
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     	});
     	const keydown = useMutableCallback((event: KeyboardEvent) => {
-    		if (!popup || popup.preview) {
+    		if (!popup) {
     			return;
     		}
@@ Expand Down @@