mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-04-27 15:50:57 -07:00
Code Issues Projects Releases Packages Wiki Activity

Improve workspace reordering experience (#11)

Browse source
This commit is contained in:
Quang Lam 2019-10-25 17:52:54 -05:00 • committed by GitHub
parent 229c8059eb
commit 64c9650484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
catalog/requirements.txt
View file

@ -1,3 +1,3 @@
numpy==1.15.4
olefile==0.46
Pillow==5.3.0
numpy>=1.15.4
olefile>=0.46
Pillow>=6.2.0

8
package.json
View file

@ -34,7 +34,7 @@
"fs-extra": "8.1.0",
"is-url": "1.2.4",
"jimp": "0.6.8",
"menubar": "6.0.8",
"menubar": "7.0.0",
"node-fetch": "2.6.0",
"request": "2.88.0",
"request-promise-native": "1.0.7",
@ -52,7 +52,7 @@
"classnames": "2.2.6",
"concurrently": "5.0.0",
"cross-env": "6.0.3",
"electron": "6.0.12",
"electron": "6.1.2",
"electron-builder": "21.2.0",
"electron-notarize": "0.1.1",
"eslint": "6.1.0",
@ -62,8 +62,8 @@
"eslint-plugin-react": "7.14.3",
"lodash.camelcase": "4.3.0",
"prop-types": "15.7.2",
"react": "16.10.2",
"react-dom": "16.10.2",
"react": "16.11.0",
"react-dom": "16.11.0",
"react-redux": "6.0.1",
"react-scripts": "3.2.0",
"react-sortable-hoc": "1.10.1",

7
src/components/main/index.js
View file

@ -116,6 +116,10 @@ const styles = (theme) => ({
left: 180,
fontFamily: theme.typography.fontFamily,
},
grabbing: {
cursor: 'grabbing !important',
pointerEvents: 'auto !important',
},
});
const SortableItem = sortableElement(({ value }) => {
@ -174,7 +178,8 @@ const Main = ({
isFullScreen && classes.sidebarTopFullScreen)}
>
<SortableContainer
pressDelay={100}
pressDelay={250}
helperClass={classes.grabbing}
onSortEnd={({ oldIndex, newIndex }) => {
if (oldIndex === newIndex) return;
const oldWorkspace = workspacesList[oldIndex];

42
yarn.lock
View file

@ -5201,10 +5201,10 @@ electron-window-state@5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
electron@6.0.12:
version "6.0.12"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.12.tgz#85bf0061e32f660256cfde95488f1cb75253bc94"
integrity sha512-70ODZa1RP6K0gE9IV9YLCXPSyhLjXksCuYSSPb3MljbfwfHo5uE6X0CGxzm+54YuPdE2e7EPnWZxOOsJYrS5iQ==
electron@6.1.2:
version "6.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.2.tgz#87ad84d9560a58c434140c70f459e97bc2dd25f5"
integrity sha512-zVste1obJC645RrU4PP+CqU8Yq33h8fzS7zx3tWbiNnyRzp6m7O2bpgKLJBRZ/4BPRsNCqSSXm4vimyGPUXVaw==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"
@ -8639,10 +8639,10 @@ memory-fs@^0.4.0, memory-fs@^0.4.1:
errno "^0.1.3"
readable-stream "^2.0.1"
menubar@6.0.8:
version "6.0.8"
resolved "https://registry.yarnpkg.com/menubar/-/menubar-6.0.8.tgz#deff4b4227c73149f6316c481accb1486e7c9e7f"
integrity sha512-S02SLiqec8MAUbV2vsUThh0P9XPKS9mrHVN3c/6T1g+tuHwFX7TRup3xCAjIGCO+Hxs32tWmjqVh4KjBGIXudQ==
menubar@7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/menubar/-/menubar-7.0.0.tgz#7d1a1a0adcd003a7fb3ef81cea91c0865a95f18d"
integrity sha512-83cton9fdguCSpkDvFyeYIZ0wWUlpDq610D2KAcXzlQeYr9ccSHtLlLt85RqCeBAcyLVZ2lu8MSt7KHODlcIOw==
dependencies:
electron-positioner "^4.1.0"
@ -10863,15 +10863,15 @@ react-dev-utils@^9.1.0:
strip-ansi "5.2.0"
text-table "0.2.0"
react-dom@16.10.2:
version "16.10.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz#4840bce5409176bc3a1f2bd8cb10b92db452fda6"
integrity sha512-kWGDcH3ItJK4+6Pl9DZB16BXYAZyrYQItU4OMy0jAkv5aNqc+mAKb4TpFtAteI6TJZu+9ZlNhaeNQSVQDHJzkw==
react-dom@16.11.0:
version "16.11.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5"
integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.16.2"
scheduler "^0.17.0"
react-error-overlay@^6.0.3:
version "6.0.3"
@ -10994,10 +10994,10 @@ react-transition-group@^2.2.1:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"
react@16.10.2:
version "16.10.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz#a5ede5cdd5c536f745173c8da47bda64797a4cf0"
integrity sha512-MFVIq0DpIhrHFyqLU0S3+4dIcBhhOvBE8bJ/5kHPVOVaGdo0KuiQzpcjCPsf585WvhypqtrMILyoE2th6dT+Lw==
react@16.11.0:
version "16.11.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb"
integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
@ -11643,10 +11643,10 @@ saxes@^3.1.9:
dependencies:
xmlchars "^2.1.1"
scheduler@^0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1"
integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg==
scheduler@^0.17.0:
version "0.17.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe"
integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"