diff --git a/package.json b/package.json index f5292c22..4deb5991 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "faircopy", - "version": "1.1.9-dev.2", + "version": "1.1.9-dev.5", "description": "A word processor for the humanities scholar.", "main": "public/electron.js", "private": true, @@ -27,10 +27,10 @@ "author": "Performant Software Solutions LLC", "homepage": ".", "devDependencies": { + "@electron/notarize": "^2.1.0", "dotenv": "^8.2.0", "electron": "^25.5.0", - "electron-builder": "^24.6.3", - "@electron/notarize": "^2.1.0" + "electron-builder": "^24.6.3" }, "dependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", diff --git a/public/css/ProjectNavigator.css b/public/css/ProjectNavigator.css index b1c23934..05b9b35f 100644 --- a/public/css/ProjectNavigator.css +++ b/public/css/ProjectNavigator.css @@ -9,6 +9,7 @@ #ProjectNavigator .tree-item-name { margin-left: 10px; + padding-right: 10px; display: inline-block; width: 100%; } diff --git a/public/main-process/worker-window-preload.js b/public/main-process/worker-window-preload.js index 6810bd40..d48b4014 100644 --- a/public/main-process/worker-window-preload.js +++ b/public/main-process/worker-window-preload.js @@ -1,5 +1,7 @@ const preloadServices = require('./preload-worker-services') +const JSZip = require('jszip'); +preloadServices.services.JSZip = JSZip window.fairCopy = { rootComponent: "WorkerWindow", diff --git a/src/components/main-window/ProjectNavigator.js b/src/components/main-window/ProjectNavigator.js index a9f2688d..7d37c449 100644 --- a/src/components/main-window/ProjectNavigator.js +++ b/src/components/main-window/ProjectNavigator.js @@ -6,6 +6,7 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight'; import TreeItem from '@material-ui/lab/TreeItem'; import { Button, Icon, Typography, Chip, Tooltip } from '@material-ui/core'; import { getResourceIcon } from '../../model/resource-icon'; +import { ellipsis } from '../../model/ellipsis' export default class ProjectNavigator extends Component { @@ -48,7 +49,9 @@ export default class ProjectNavigator extends Component { } renderTreeItemLabel(resourceName, resourceID, errorCount) { - const { onCloseResource } = this.props + const { onCloseResource, panelWidth } = this.props + const maxLength = (panelWidth-170)/10 + const resourceNameElided = ellipsis( resourceName, maxLength ) const onClick = (event) => { onCloseResource(resourceID) @@ -57,7 +60,7 @@ export default class ProjectNavigator extends Component { return (