alternative disabled button fix to fix failing unittest

jupyterlab · Feb 14, 2020 · cac88a5 · kgryte · Feb 14, 2020 · cac88a5
1 parent 26fb337
commit cac88a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { classes } from 'typestyle';
 import { Dialog, showDialog } from '@jupyterlab/apputils';
 import { PathExt } from '@jupyterlab/coreutils';
+
 import {
   // NOTE: keep in alphabetical order
   branchIconClass,
@@ -14,7 +15,7 @@ import {
   toolbarButtonClass,
   toolbarClass,
   toolbarMenuButtonClass,
-  toolbarMenuButtonInactiveClass,
+  toolbarMenuButtonEnabledClass,
   toolbarMenuButtonIconClass,
   toolbarMenuButtonSubtitleClass,
   toolbarMenuButtonTitleClass,
@@ -207,7 +208,7 @@ export class Toolbar extends React.Component<IToolbarProps, IToolbarState> {
       <div className={toolbarMenuWrapperClass}>
         <button
           disabled
-          className={toolbarMenuButtonInactiveClass}
+          className={toolbarMenuButtonClass}
           title={`Current repository: ${this.state.repository}`}
           onClick={this._onRepositoryClick}
         >
@@ -249,7 +250,10 @@ export class Toolbar extends React.Component<IToolbarProps, IToolbarState> {
     return (
       <div className={toolbarMenuWrapperClass}>
         <button
-          className={toolbarMenuButtonClass}
+          className={[
+            toolbarMenuButtonClass,
+            toolbarMenuButtonEnabledClass
+          ].join(' ')}
           title={`Change the current branch: ${this.state.branch}`}
           onClick={this._onBranchClick}
         >

diff --git a/src/style/Toolbar.ts b/src/style/Toolbar.ts
@@ -1,5 +1,4 @@
 import { style } from 'typestyle';
-import { NestedCSSProperties } from 'typestyle/lib/types';
 
 export const toolbarClass = style({
   display: 'flex',
@@ -31,7 +30,7 @@ export const toolbarMenuWrapperClass = style({
   borderBottomColor: 'var(--jp-border-color2)'
 });
 
-const toolbarMenuButtonProps: NestedCSSProperties = {
+export const toolbarMenuButtonClass = style({
   boxSizing: 'border-box',
   display: 'flex',
   flexDirection: 'row',
@@ -52,13 +51,9 @@ const toolbarMenuButtonProps: NestedCSSProperties = {
   borderRadius: 0,
 
   background: 'var(--jp-layout-color1)'
-};
-
-export const toolbarMenuButtonInactiveClass = style(toolbarMenuButtonProps);
-
-export const toolbarMenuButtonClass = style({
-  ...toolbarMenuButtonProps,
+});
 
+export const toolbarMenuButtonEnabledClass = style({
   $nest: {
     '&:hover': {
       backgroundColor: 'var(--jp-layout-color2)'