@electerm/electerm-react 3.15.105 → 3.15.110

package/client/components/terminal/drop-file-modal.jsx

@@ -1,11 +1,17 @@
-import { Component } from 'react'
 import Modal from '../common/modal'
 
 const e = window.translate
 
-export class DropFileModal extends Component {
-  renderSerialFooter () {
-    const { onSelect } = this.props
+export function DropFileModal (props) {
+  const {
+    visible,
+    files,
+    isSerial,
+    onSelect,
+    onCancel
+  } = props
+
+  const renderSerialFooter = () => {
     return (
       <>
         <button
@@ -26,8 +32,7 @@ export class DropFileModal extends Component {
     )
   }
 
-  renderSshFooter () {
-    const { onSelect } = this.props
+  const renderSshFooter = () => {
     return (
       <>
         <button
@@ -55,34 +60,35 @@ export class DropFileModal extends Component {
     )
   }
 
-  render () {
-    const {
-      visible,
-      files,
-      isSerial,
-      onCancel
-    } = this.props
-
-    if (!visible) {
-      return null
-    }
-
+  const renderList = () => {
     return (
-      <Modal
-        title='?'
-        open={visible}
-        onCancel={onCancel}
-        footer={
-          <div className='custom-modal-footer-buttons'>
-            {isSerial ? this.renderSerialFooter() : this.renderSshFooter()}
-          </div>
-        }
-        width={400}
-      >
-        <p>{files?.map(f => f.path).join(', ')}</p>
-      </Modal>
+      <ul>
+        {files?.map(f => (
+          <li key={f.path}>{f.path}</li>
+        ))}
+      </ul>
     )
   }
+
+  if (!visible) {
+    return null
+  }
+
+  return (
+    <Modal
+      title='?'
+      open={visible}
+      onCancel={onCancel}
+      footer={
+        <div className='custom-modal-footer-buttons'>
+          {isSerial ? renderSerialFooter() : renderSshFooter()}
+        </div>
+      }
+      width={400}
+    >
+      {renderList()}
+    </Modal>
+  )
 }
 
 export default DropFileModal

package/client/components/terminal/terminal.jsx

@@ -479,19 +479,13 @@ class Term extends Component {
         return
       }
 
-      const hasMultiFiles = filePaths.length > 1
-
       if (isSshTerminal) {
         const behavior = this.props.config.dragDropBehavior || 'ask'
-        // multi-file drops always paste paths, skip the action modal
-        if (behavior === 'ask' && !hasMultiFiles) {
+        if (behavior === 'ask') {
           this.setState({
             dropFileModalVisible: true,
             droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
           })
-        } else if (hasMultiFiles) {
-          const filesAll = filePaths.map(path => `"${path}"`).join(' ')
-          this.attachAddon._sendData(filesAll)
         } else {
           this.handleDropFileAction(behavior, filePaths.map(path => ({ path, isRemote: false })))
         }
@@ -499,16 +493,10 @@ class Term extends Component {
       }
 
       if (isSerialTerminal) {
-        // multi-file drops always paste paths, skip the action modal
-        if (hasMultiFiles) {
-          const filesAll = filePaths.map(path => `"${path}"`).join(' ')
-          this.attachAddon._sendData(filesAll)
-        } else {
-          this.setState({
-            dropFileModalVisible: true,
-            droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
-          })
-        }
+        this.setState({
+          dropFileModalVisible: true,
+          droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
+        })
         return
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "3.15.105",
+  "version": "3.15.110",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",