aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-21 15:04:31 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-21 15:04:31 +0100
commita9734f24bf15ab322c8244fbb8e86c37caf30f4a (patch)
treeace7e455e817df831bf571aa4851a99b0e37e145 /src/components
parentadd workspace drawer toggle menu item and shortcut (diff)
downloadferdium-app-a9734f24bf15ab322c8244fbb8e86c37caf30f4a.tar.gz
ferdium-app-a9734f24bf15ab322c8244fbb8e86c37caf30f4a.tar.zst
ferdium-app-a9734f24bf15ab322c8244fbb8e86c37caf30f4a.zip
improve workspace switching ux
Diffstat (limited to 'src/components')
-rw-r--r--src/components/layout/AppLayout.js3
-rw-r--r--src/components/ui/FullscreenLoader/index.js4
-rw-r--r--src/components/ui/WebviewLoader/index.js2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index e06192f87..284a2523a 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -15,6 +15,8 @@ import ErrorBoundary from '../util/ErrorBoundary';
15 15
16import { isWindows } from '../../environment'; 16import { isWindows } from '../../environment';
17import { workspacesState } from '../../features/workspaces/state'; 17import { workspacesState } from '../../features/workspaces/state';
18import FullscreenLoader from '../ui/FullscreenLoader';
19import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
18 20
19function createMarkup(HTMLString) { 21function createMarkup(HTMLString) {
20 return { __html: HTMLString }; 22 return { __html: HTMLString };
@@ -123,6 +125,7 @@ class AppLayout extends Component {
123 {workspacesDrawer} 125 {workspacesDrawer}
124 {sidebar} 126 {sidebar}
125 <div className="app__service"> 127 <div className="app__service">
128 <WorkspaceSwitchingIndicator />
126 {news.length > 0 && news.map(item => ( 129 {news.length > 0 && news.map(item => (
127 <InfoBar 130 <InfoBar
128 key={item.id} 131 key={item.id}
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 6ecf4d395..06dab1eb6 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -16,13 +16,13 @@ export default @observer @withTheme @injectSheet(styles) class FullscreenLoader
16 theme: PropTypes.object.isRequired, 16 theme: PropTypes.object.isRequired,
17 spinnerColor: PropTypes.string, 17 spinnerColor: PropTypes.string,
18 children: PropTypes.node, 18 children: PropTypes.node,
19 } 19 };
20 20
21 static defaultProps = { 21 static defaultProps = {
22 className: null, 22 className: null,
23 spinnerColor: null, 23 spinnerColor: null,
24 children: null, 24 children: null,
25 } 25 };
26 26
27 render() { 27 render() {
28 const { 28 const {
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 3a3dbbe49..d200b8193 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -11,7 +11,7 @@ export default @observer @injectSheet(styles) class WebviewLoader extends Compon
11 static propTypes = { 11 static propTypes = {
12 name: PropTypes.string.isRequired, 12 name: PropTypes.string.isRequired,
13 classes: PropTypes.object.isRequired, 13 classes: PropTypes.object.isRequired,
14 } 14 };
15 15
16 render() { 16 render() {
17 const { classes, name } = this.props; 17 const { classes, name } = this.props;