Skip to content

Commit cac88a5

Browse files
committed
alternative disabled button fix to fix failing unittest
1 parent 26fb337 commit cac88a5

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/components/Toolbar.tsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as React from 'react';
22
import { classes } from 'typestyle';
33
import { Dialog, showDialog } from '@jupyterlab/apputils';
44
import { PathExt } from '@jupyterlab/coreutils';
5+
56
import {
67
// NOTE: keep in alphabetical order
78
branchIconClass,
@@ -14,7 +15,7 @@ import {
1415
toolbarButtonClass,
1516
toolbarClass,
1617
toolbarMenuButtonClass,
17-
toolbarMenuButtonInactiveClass,
18+
toolbarMenuButtonEnabledClass,
1819
toolbarMenuButtonIconClass,
1920
toolbarMenuButtonSubtitleClass,
2021
toolbarMenuButtonTitleClass,
@@ -207,7 +208,7 @@ export class Toolbar extends React.Component<IToolbarProps, IToolbarState> {
207208
<div className={toolbarMenuWrapperClass}>
208209
<button
209210
disabled
210-
className={toolbarMenuButtonInactiveClass}
211+
className={toolbarMenuButtonClass}
211212
title={`Current repository: ${this.state.repository}`}
212213
onClick={this._onRepositoryClick}
213214
>
@@ -249,7 +250,10 @@ export class Toolbar extends React.Component<IToolbarProps, IToolbarState> {
249250
return (
250251
<div className={toolbarMenuWrapperClass}>
251252
<button
252-
className={toolbarMenuButtonClass}
253+
className={[
254+
toolbarMenuButtonClass,
255+
toolbarMenuButtonEnabledClass
256+
].join(' ')}
253257
title={`Change the current branch: ${this.state.branch}`}
254258
onClick={this._onBranchClick}
255259
>

src/style/Toolbar.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { style } from 'typestyle';
2-
import { NestedCSSProperties } from 'typestyle/lib/types';
32

43
export const toolbarClass = style({
54
display: 'flex',
@@ -31,7 +30,7 @@ export const toolbarMenuWrapperClass = style({
3130
borderBottomColor: 'var(--jp-border-color2)'
3231
});
3332

34-
const toolbarMenuButtonProps: NestedCSSProperties = {
33+
export const toolbarMenuButtonClass = style({
3534
boxSizing: 'border-box',
3635
display: 'flex',
3736
flexDirection: 'row',
@@ -52,13 +51,9 @@ const toolbarMenuButtonProps: NestedCSSProperties = {
5251
borderRadius: 0,
5352

5453
background: 'var(--jp-layout-color1)'
55-
};
56-
57-
export const toolbarMenuButtonInactiveClass = style(toolbarMenuButtonProps);
58-
59-
export const toolbarMenuButtonClass = style({
60-
...toolbarMenuButtonProps,
54+
});
6155

56+
export const toolbarMenuButtonEnabledClass = style({
6257
$nest: {
6358
'&:hover': {
6459
backgroundColor: 'var(--jp-layout-color2)'

0 commit comments

Comments
 (0)