Fix js injection in message input

TryQuiet · Oct 9, 2023 · a050135 · a050135
1 parent ce6501e
commit a050135
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/...es/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx b/...es/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
@@ -19,7 +19,6 @@ export const Disabled = Template.bind({})
 
 const args: ChannelInputProps = {
   channelId: 'channelId',
-  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
   inputPlaceholder: '#general as @alice',
   onChange: function (_arg: string): void {},
   onKeyPress: function (input: string): void {
@@ -34,7 +33,6 @@ const args: ChannelInputProps = {
 
 const argsDisabledInput: ChannelInputProps = {
   channelId: 'channelId',
-  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
   inputPlaceholder: '#general as @alice',
   onChange: function (_arg: string): void {},
   onKeyPress: function (input: string): void {

diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
@@ -529,22 +529,6 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
         direction='column'
         justifyContent='center'
       >
-        {/* <MentionPoper anchorEl={anchorEl} selected={selected}>
-          {mentionsToSelect.map((target, index) => (
-            <MentionElement
-              key={index}
-              name={target.nickname}
-              highlight={index === selected}
-              onMouseEnter={() => {
-                setSelected(index)
-              }}
-              channelName={channelName}
-              onClick={e => {
-                mentionSelectAction(e)
-              }}
-            />
-          ))}
-        </MentionPoper> */}
         <Grid
           container
           direction='row'
@@ -586,18 +570,14 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
                   onChange={onChangeCb}
                   onKeyDown={onKeyDownCb}
                   onPaste={async e => {
-                    e.preventDefault()
                     const files = e.clipboardData.files
+                    if (files.length) e.preventDefault()
                     for (let i = 0; i < files.length; i++) {
                       const fileExt = path.extname(files[i].name).toLowerCase()
                       const fileName = path.basename(files[i].name, fileExt)
                       const arrayBuffer = await files[i].arrayBuffer()
                       handleClipboardFiles(arrayBuffer, fileExt, fileName)
                     }
-                    if (!files.length) {
-                      const text = e.clipboardData.getData('text/plain').replace(/(\r\n|\r|\n)/g, '<br />')
-                      document.execCommand('insertHTML', false, text)
-                    }
                   }}
                   data-testid='messageInput'
                 />