Added widgets styles

67ab446e · David Davó · abf2a721 · 67ab446e · 67ab446e · 67ab446e
Commit 67ab446e authored Jul 30, 2021 by David Davó
42 changed files
--- a/ihaskell-display/ihaskell-widgets/README.md
+++ b/ihaskell-display/ihaskell-widgets/README.md
@@ -21,6 +21,8 @@ jupyter nbconvert *.ipynb --to notebook --inplace --clear-output
 - [ ] Make the `output` widget work
 - [ ] Processing of widget messages concurrently
 - [ ] Make the layout widget values more 'Haskelian': Instead of checking if the string is valid at runtime, make some types so it's checked at compile-time
+- [ ] Create a serializable color data type instead of using `Maybe String`
+- [ ] Overload setField so it can be used with `Maybes` without having to put `Just` every time
 - [ ] Add some "utils" work:
    - [ ] Create media widget from file
    - [ ] Get the selected label from a selection value
\ No newline at end of file
--- a/ihaskell-display/ihaskell-widgets/ihaskell-widgets.cabal
+++ b/ihaskell-display/ihaskell-widgets/ihaskell-widgets.cabal
@@ -108,6 +108,9 @@ library
                       IHaskell.Display.Widgets.String.TextArea
                       IHaskell.Display.Widgets.Style.ButtonStyle
                       IHaskell.Display.Widgets.Style.DescriptionStyle
+                       IHaskell.Display.Widgets.Style.ProgressStyle
+                       IHaskell.Display.Widgets.Style.SliderStyle
+                       IHaskell.Display.Widgets.Style.ToggleButtonsStyle

                       IHaskell.Display.Widgets.Layout.Common
                       IHaskell.Display.Widgets.Layout.LayoutWidget

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets.hs
@@ -57,6 +57,9 @@ import           IHaskell.Display.Widgets.String.TextArea as X

 import           IHaskell.Display.Widgets.Style.ButtonStyle as X
 import           IHaskell.Display.Widgets.Style.DescriptionStyle as X
+import           IHaskell.Display.Widgets.Style.ProgressStyle as X
+import           IHaskell.Display.Widgets.Style.SliderStyle as X
+import           IHaskell.Display.Widgets.Style.ToggleButtonsStyle as X

 import           IHaskell.Display.Widgets.Common as X
 import           IHaskell.Display.Widgets.Types as X (setField, getField, properties, triggerDisplay,

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/CheckBox.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/CheckBox.hs
@@ -40,7 +40,7 @@ mkCheckBox = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boolAttrs = defaultBoolWidget "CheckboxView" "CheckboxModel" layout dstyle
+  let boolAttrs = defaultBoolWidget "CheckboxView" "CheckboxModel" layout $ StyleWidget dstyle
      checkBoxAttrs = (Indent =:: True)
                      :& RNil
      widgetState = WidgetState $ boolAttrs <+> checkBoxAttrs

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/ToggleButton.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/ToggleButton.hs
@@ -40,7 +40,7 @@ mkToggleButton = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boolState = defaultBoolWidget "ToggleButtonView" "ToggleButtonModel" layout dstyle
+  let boolState = defaultBoolWidget "ToggleButtonView" "ToggleButtonModel" layout $ StyleWidget dstyle
      toggleState = (Icon =:: "")
                    :& (ButtonStyle =:: DefaultButton)
                    :& RNil

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/Valid.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/Valid.hs
@@ -39,7 +39,7 @@ mkValidWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boolState = defaultBoolWidget "ValidView" "ValidModel" layout dstyle
+  let boolState = defaultBoolWidget "ValidView" "ValidModel" layout $ StyleWidget dstyle
      validState = (ReadOutMsg =:: "") :& RNil
      widgetState = WidgetState $ boolState <+> validState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Button.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Button.hs
@@ -38,14 +38,12 @@ mkButton = do
  -- Default properties, with a random uuid
  wid <- U.random
  layout <- mkLayout
-  dstyle <- mkDescriptionStyle
  btnstyle <- mkButtonStyle

-  let ddw = defaultDescriptionWidget "ButtonView" "ButtonModel" layout dstyle
+  let ddw = defaultDescriptionWidget "ButtonView" "ButtonModel" layout $ StyleWidget btnstyle
      but = (Disabled =:: False)
            :& (Icon =:: "")
            :& (ButtonStyle =:: DefaultButton)
-            :& (StyleButton =:: btnstyle)
            :& (ClickHandler =:: return ())
            :& RNil
      buttonState = WidgetState (ddw <+> but)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/ColorPicker.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/ColorPicker.hs
@@ -39,7 +39,7 @@ mkColorPicker = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let ddw = defaultDescriptionWidget "ColorPickerView" "ColorPickerModel" layout dstyle
+  let ddw = defaultDescriptionWidget "ColorPickerView" "ColorPickerModel" layout $ StyleWidget dstyle
      color = (StringValue =:: "black")
              :& (Concise =:: False)
              :& (Disabled =:: False)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs
@@ -111,13 +111,10 @@ pattern Axes = S.SAxes
 pattern ButtonColor = S.SButtonColor
 pattern FontWeight = S.SFontWeight
 pattern DescriptionWidth = S.SDescriptionWidth
-
-pattern StyleButton = S.SStyleButton
-pattern StyleDescription = S.SStyleDescription
-pattern StyleProgress = S.SStyleProgress
-pattern StyleSlider = S.SStyleSlider
-pattern StyleToggleButton = S.SStyleToggleButton
-
+pattern BarColor = S.SBarColor
+pattern HandleColor = S.SHandleColor
+pattern ButtonWidth = S.SButtonWidth
+pattern Style = S.SStyle
 -- | Close a widget's comm
 closeWidget :: IHaskellWidget w => w -> IO ()
 closeWidget w = widgetSendClose w emptyObject

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/DatePicker.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/DatePicker.hs
@@ -41,7 +41,7 @@ mkDatePicker = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let ddw = defaultDescriptionWidget "DatePickerView" "DatePickerModel" layout dstyle
+  let ddw = defaultDescriptionWidget "DatePickerView" "DatePickerModel" layout $ StyleWidget dstyle
      date = (DateValue =:: defaultDate)
              :& (Disabled =:: False)
              :& RNil

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/BoundedFloatText.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/BoundedFloatText.hs
@@ -41,7 +41,7 @@ mkBoundedFloatText = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedFloatAttrs = defaultBoundedFloatWidget "FloatTextView" "BoundedFloatTextModel" layout dstyle
+  let boundedFloatAttrs = defaultBoundedFloatWidget "FloatTextView" "BoundedFloatTextModel" layout $ StyleWidget dstyle
      textAttrs = (Disabled =:: False)
                  :& (ContinuousUpdate =:: False)
                  :& (StepFloat =:: Nothing)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatLogSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatLogSlider.hs
@@ -41,7 +41,7 @@ mkFloatLogSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedLogFloatAttrs = defaultBoundedLogFloatWidget "FloatLogSliderView" "FloatLogSliderModel" layout dstyle
+  let boundedLogFloatAttrs = defaultBoundedLogFloatWidget "FloatLogSliderView" "FloatLogSliderModel" layout $ StyleWidget dstyle
      sliderAttrs = (StepFloat =:: Just 0.1)
                    :& (Orientation =:: HorizontalOrientation)
                    :& (ReadOut =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatProgress.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatProgress.hs
@@ -26,7 +26,7 @@ import           IHaskell.IPython.Message.UUID as U
 import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Common
 import           IHaskell.Display.Widgets.Layout.LayoutWidget
-import           IHaskell.Display.Widgets.Style.DescriptionStyle
+import           IHaskell.Display.Widgets.Style.ProgressStyle

 -- | 'FloatProgress' represents an FloatProgress widget from IPython.html.widgets.
 type FloatProgress = IPythonWidget 'FloatProgressType
@@ -37,9 +37,9 @@ mkFloatProgress = do
  -- Default properties, with a random uuid
  wid <- U.random
  layout <- mkLayout
-  dstyle <- mkDescriptionStyle
+  pstyle <- mkProgressStyle

-  let boundedFloatAttrs = defaultBoundedFloatWidget "ProgressView" "FloatProgressModel" layout dstyle
+  let boundedFloatAttrs = defaultBoundedFloatWidget "ProgressView" "FloatProgressModel" layout $ StyleWidget pstyle
      progressAttrs = (Orientation =:: HorizontalOrientation)
                      :& (BarStyle =:: DefaultBar)
                      :& RNil

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloat/FloatSlider.hs
@@ -41,7 +41,7 @@ mkFloatSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedFloatAttrs = defaultBoundedFloatWidget "FloatSliderView" "FloatSliderModel" layout dstyle
+  let boundedFloatAttrs = defaultBoundedFloatWidget "FloatSliderView" "FloatSliderModel" layout $ StyleWidget dstyle
      sliderAttrs = (StepFloat =:: Just 0.1)
                    :& (Orientation =:: HorizontalOrientation)
                    :& (ReadOut =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloatRange/FloatRangeSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/BoundedFloatRange/FloatRangeSlider.hs
@@ -42,7 +42,7 @@ mkFloatRangeSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedFloatAttrs = defaultBoundedFloatRangeWidget "FloatRangeSliderView" "FloatRangeSliderModel" layout dstyle
+  let boundedFloatAttrs = defaultBoundedFloatRangeWidget "FloatRangeSliderView" "FloatRangeSliderModel" layout $ StyleWidget dstyle
      sliderAttrs = (StepFloat =:: Just 0.1)
                    :& (Orientation =:: HorizontalOrientation)
                    :& (ReadOut =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/FloatText.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Float/FloatText.hs
@@ -41,7 +41,7 @@ mkFloatText = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let floatAttrs = defaultFloatWidget "FloatTextView" "FloatTextModel" layout dstyle
+  let floatAttrs = defaultFloatWidget "FloatTextView" "FloatTextModel" layout $ StyleWidget dstyle
      textAttrs = (Disabled =:: False)
                  :& (ContinuousUpdate =:: False)
                  :& (StepFloat =:: Nothing)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/BoundedIntText.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/BoundedIntText.hs
@@ -41,7 +41,7 @@ mkBoundedIntText = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedIntAttrs = defaultBoundedIntWidget "IntTextView" "BoundedIntTextModel" layout dstyle
+  let boundedIntAttrs = defaultBoundedIntWidget "IntTextView" "BoundedIntTextModel" layout $ StyleWidget dstyle
      textAttrs = (Disabled =:: False)
                  :& (ContinuousUpdate =:: False)
                  :& (StepInt =:: Just 1)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/IntProgress.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/IntProgress.hs
@@ -39,7 +39,7 @@ mkIntProgress = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedIntAttrs = defaultBoundedIntWidget "ProgressView" "IntProgressModel" layout dstyle
+  let boundedIntAttrs = defaultBoundedIntWidget "ProgressView" "IntProgressModel" layout $ StyleWidget dstyle
      progressAttrs = (Orientation =:: HorizontalOrientation)
                      :& (BarStyle =:: DefaultBar)
                      :& RNil

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/IntSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/IntSlider.hs
@@ -41,7 +41,7 @@ mkIntSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedIntAttrs = defaultBoundedIntWidget "IntSliderView" "IntSliderModel" layout dstyle
+  let boundedIntAttrs = defaultBoundedIntWidget "IntSliderView" "IntSliderModel" layout $ StyleWidget dstyle
      sliderAttrs = (StepInt =:: Just 1)
                    :& (Orientation =:: HorizontalOrientation)
                    :& (ReadOut =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/Play.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedInt/Play.hs
@@ -41,7 +41,7 @@ mkPlay = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedIntAttrs = defaultBoundedIntWidget "PlayView" "PlayModel" layout dstyle
+  let boundedIntAttrs = defaultBoundedIntWidget "PlayView" "PlayModel" layout $ StyleWidget dstyle
      playAttrs = (Playing =:: True)
                  :& (Repeat =:: True)
                  :& (Interval =:: 100)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedIntRange/IntRangeSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/BoundedIntRange/IntRangeSlider.hs
@@ -42,7 +42,7 @@ mkIntRangeSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let boundedIntAttrs = defaultBoundedIntRangeWidget "IntRangeSliderView" "IntRangeSliderModel" layout dstyle
+  let boundedIntAttrs = defaultBoundedIntRangeWidget "IntRangeSliderView" "IntRangeSliderModel" layout $ StyleWidget dstyle
      sliderAttrs = (StepInt =:: Just 1)
                    :& (Orientation =:: HorizontalOrientation)
                    :& (ReadOut =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/IntText.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Int/IntText.hs
@@ -41,7 +41,7 @@ mkIntText = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let intAttrs = defaultIntWidget "IntTextView" "IntTextModel" layout dstyle
+  let intAttrs = defaultIntWidget "IntTextView" "IntTextModel" layout $ StyleWidget dstyle
      textAttrs = (Disabled =:: False)
                  :& (ContinuousUpdate =:: False)
                  :& (StepInt =:: Just 1)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Dropdown.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Dropdown.hs
@@ -41,7 +41,7 @@ mkDropdown = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultSelectionWidget "DropdownView" "DropdownModel" layout dstyle
+  let widgetState = WidgetState $ defaultSelectionWidget "DropdownView" "DropdownModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/RadioButtons.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/RadioButtons.hs
@@ -40,7 +40,7 @@ mkRadioButtons = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultSelectionWidget "RadioButtonsView" "RadioButtonsModel" layout dstyle
+  let widgetState = WidgetState $ defaultSelectionWidget "RadioButtonsView" "RadioButtonsModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Select.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Select.hs
@@ -41,7 +41,7 @@ mkSelect = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let selectionAttrs = defaultSelectionWidget "SelectView" "SelectModel" layout dstyle
+  let selectionAttrs = defaultSelectionWidget "SelectView" "SelectModel" layout $ StyleWidget dstyle
      selectAttrs = (Rows =:: Just 5)
                    :& RNil
      widgetState = WidgetState $ selectionAttrs <+> selectAttrs

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectMultiple.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectMultiple.hs
@@ -42,7 +42,7 @@ mkSelectMultiple = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let multipleSelectionAttrs = defaultMultipleSelectionWidget "SelectMultipleView" "SelectMultipleModel" layout dstyle
+  let multipleSelectionAttrs = defaultMultipleSelectionWidget "SelectMultipleView" "SelectMultipleModel" layout $ StyleWidget dstyle
      selectMultipleAttrs = (Rows =:: Just 5)
                            :& RNil
      widgetState = WidgetState $ multipleSelectionAttrs <+> selectMultipleAttrs

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectionRangeSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectionRangeSlider.hs
@@ -41,7 +41,7 @@ mkSelectionRangeSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let selectionAttrs = defaultMultipleSelectionWidget "SelectionRangeSliderView" "SelectionRangeSliderModel" layout dstyle
+  let selectionAttrs = defaultMultipleSelectionWidget "SelectionRangeSliderView" "SelectionRangeSliderModel" layout $ StyleWidget dstyle
      selectionRangeSliderAttrs = (Orientation =:: HorizontalOrientation)
                                  :& (ReadOut =:: True)
                                  :& (ContinuousUpdate =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectionSlider.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectionSlider.hs
@@ -40,7 +40,7 @@ mkSelectionSlider = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let selectionAttrs = defaultSelectionNonemptyWidget "SelectionSliderView" "SelectionSliderModel" layout dstyle
+  let selectionAttrs = defaultSelectionNonemptyWidget "SelectionSliderView" "SelectionSliderModel" layout $ StyleWidget dstyle
      selectionSliderAttrs = (Orientation =:: HorizontalOrientation)
                             :& (ReadOut =:: True)
                             :& (ContinuousUpdate =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/ToggleButtons.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/ToggleButtons.hs
@@ -41,7 +41,7 @@ mkToggleButtons = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let selectionAttrs = defaultSelectionWidget "ToggleButtonsView" "ToggleButtonsModel" layout dstyle
+  let selectionAttrs = defaultSelectionWidget "ToggleButtonsView" "ToggleButtonsModel" layout $ StyleWidget dstyle
      toggleButtonsAttrs = (Tooltips =:: [])
                           :& (Icons =:: [])
                           :& (ButtonStyle =:: DefaultButton)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
@@ -119,12 +119,10 @@ singletons
             | ButtonColor
             | FontWeight
             | DescriptionWidth
-             -- Singletons for child style widgets
-             | StyleButton
-             | StyleDescription
-             | StyleProgress
-             | StyleSlider
-             | StyleToggleButton
+             | BarColor
+             | HandleColor
+             | ButtonWidth
+             | Style
             -- Now the ones for layout
             -- Every layout property comes with an L before the name to avoid conflict
             -- The patterns from Layout.Common remove that leading L

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Combobox.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Combobox.hs
@@ -40,7 +40,7 @@ mkComboboxWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let txtWidget = defaultTextWidget "ComboboxView" "ComboboxModel" layout dstyle
+  let txtWidget = defaultTextWidget "ComboboxView" "ComboboxModel" layout $ StyleWidget dstyle
      boxWidget = (Options =:: [])
                  :& (EnsureOption =:: False)
                  :& RNil

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/HTML.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/HTML.hs
@@ -37,7 +37,7 @@ mkHTMLWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultStringWidget "HTMLView" "HTMLModel" layout dstyle
+  let widgetState = WidgetState $ defaultStringWidget "HTMLView" "HTMLModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/HTMLMath.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/HTMLMath.hs
@@ -37,7 +37,7 @@ mkHTMLMathWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultStringWidget "HTMLMathView" "HTMLMathModel" layout dstyle
+  let widgetState = WidgetState $ defaultStringWidget "HTMLMathView" "HTMLMathModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Label.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Label.hs
@@ -37,7 +37,7 @@ mkLabelWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultStringWidget "LabelView" "LabelModel" layout dstyle
+  let widgetState = WidgetState $ defaultStringWidget "LabelView" "LabelModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Password.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Password.hs
@@ -40,7 +40,7 @@ mkPasswordWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultTextWidget "PasswordView" "PasswordModel" layout dstyle
+  let widgetState = WidgetState $ defaultTextWidget "PasswordView" "PasswordModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Text.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Text.hs
@@ -40,7 +40,7 @@ mkTextWidget = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let widgetState = WidgetState $ defaultTextWidget "TextView" "TextModel" layout dstyle
+  let widgetState = WidgetState $ defaultTextWidget "TextView" "TextModel" layout $ StyleWidget dstyle

  stateIO <- newIORef widgetState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/TextArea.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/TextArea.hs
@@ -39,7 +39,7 @@ mkTextArea = do
  layout <- mkLayout
  dstyle <- mkDescriptionStyle

-  let strAttrs = defaultStringWidget "TextareaView" "TextareaModel" layout dstyle
+  let strAttrs = defaultStringWidget "TextareaView" "TextareaModel" layout $ StyleWidget dstyle
      wgtAttrs = (Rows =:: Nothing)
                 :& (Disabled =:: False)
                 :& (ContinuousUpdate =:: True)

--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/DescriptionStyle.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/DescriptionStyle.hs
@@ -34,10 +34,8 @@ mkDescriptionStyle :: IO DescriptionStyle
 mkDescriptionStyle = do
  wid <- U.random

-  let stl = defaultStyleWidget "DescriptionStyleModel"
-      but = (DescriptionWidth =:: "")
-            :& RNil
-      btnStlState = WidgetState (stl <+> but)
+  let stl = defaultDescriptionStyleWidget "DescriptionStyleModel"
+      btnStlState = WidgetState stl

  stateIO <- newIORef btnStlState


--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/ProgressStyle.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/ProgressStyle.hs
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeSynonymInstances #-}
+
+{-# OPTIONS_GHC -fno-warn-orphans  #-}
+
+module IHaskell.Display.Widgets.Style.ProgressStyle
+  ( -- * Progress style
+    ProgressStyle
+    -- * Create a new progress style
+  , mkProgressStyle
+  ) where
+
+-- To keep `cabal repl` happy when running from the ihaskell repo
+import           Prelude
+
+import           Data.Aeson
+import           Data.IORef (newIORef)
+import           Data.Vinyl (Rec(..), (<+>))
+
+import           IHaskell.Display
+import           IHaskell.Eval.Widgets
+import           IHaskell.IPython.Message.UUID as U
+
+import           IHaskell.Display.Widgets.Types
+import           IHaskell.Display.Widgets.Common
+
+-- | A 'ProgressStyle' represents a Button Style from IPython.html.widgets.
+type ProgressStyle = IPythonWidget 'ProgressStyleType
+
+-- | Create a new button style
+mkProgressStyle :: IO ProgressStyle
+mkProgressStyle = do
+  wid <- U.random
+
+  let stl = defaultDescriptionStyleWidget "ProgressStyleModel"
+      but = (BarColor =:: Nothing)
+            :& RNil
+      btnStlState = WidgetState (stl <+> but)
+
+  stateIO <- newIORef btnStlState
+
+  let style = IPythonWidget wid stateIO
+
+  -- Open a comm for this widget, and store it in the kernel state
+  widgetSendOpen style $ toJSON btnStlState
+
+  -- Return the style widget
+  return style
+
+instance IHaskellWidget ProgressStyle where
+  getCommUUID = uuid
--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/SliderStyle.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/SliderStyle.hs
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeSynonymInstances #-}
+
+{-# OPTIONS_GHC -fno-warn-orphans  #-}
+
+module IHaskell.Display.Widgets.Style.SliderStyle
+  ( -- * Slider style
+    SliderStyle
+    -- * Create a new slider style
+  , mkSliderStyle
+  ) where
+
+-- To keep `cabal repl` happy when running from the ihaskell repo
+import           Prelude
+
+import           Data.Aeson
+import           Data.IORef (newIORef)
+import           Data.Vinyl (Rec(..), (<+>))
+
+import           IHaskell.Display
+import           IHaskell.Eval.Widgets
+import           IHaskell.IPython.Message.UUID as U
+
+import           IHaskell.Display.Widgets.Types
+import           IHaskell.Display.Widgets.Common
+
+-- | A 'SliderStyle' represents a Button Style from IPython.html.widgets.
+type SliderStyle = IPythonWidget 'SliderStyleType
+
+-- | Create a new button style
+mkSliderStyle :: IO SliderStyle
+mkSliderStyle = do
+  wid <- U.random
+
+  let stl = defaultDescriptionStyleWidget "SliderStyleModel"
+      but = (HandleColor =:: Nothing)
+            :& RNil
+      btnStlState = WidgetState (stl <+> but)
+
+  stateIO <- newIORef btnStlState
+
+  let style = IPythonWidget wid stateIO
+
+  -- Open a comm for this widget, and store it in the kernel state
+  widgetSendOpen style $ toJSON btnStlState
+
+  -- Return the style widget
+  return style
+
+instance IHaskellWidget SliderStyle where
+  getCommUUID = uuid
--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/ToggleButtonsStyle.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/ToggleButtonsStyle.hs
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeSynonymInstances #-}
+
+{-# OPTIONS_GHC -fno-warn-orphans  #-}
+
+module IHaskell.Display.Widgets.Style.ToggleButtonsStyle
+  ( -- * ToggleButtons style
+    ToggleButtonsStyle
+    -- * Create a new toggle buttons style
+  , mkToggleButtonsStyle
+  ) where
+
+-- To keep `cabal repl` happy when running from the ihaskell repo
+import           Prelude
+
+import           Data.Aeson
+import           Data.IORef (newIORef)
+import           Data.Vinyl (Rec(..), (<+>))
+
+import           IHaskell.Display
+import           IHaskell.Eval.Widgets
+import           IHaskell.IPython.Message.UUID as U
+
+import           IHaskell.Display.Widgets.Types
+import           IHaskell.Display.Widgets.Common
+
+-- | A 'ToggleButtonsStyle' represents a Button Style from IPython.html.widgets.
+type ToggleButtonsStyle = IPythonWidget 'ToggleButtonsStyleType
+
+-- | Create a new button style
+mkToggleButtonsStyle :: IO ToggleButtonsStyle
+mkToggleButtonsStyle = do
+  wid <- U.random
+
+  let stl = defaultDescriptionStyleWidget "ToggleButtonsStyleModel"
+      but = (ButtonWidth =:: "")
+            :& (FontWeight =:: DefaultWeight)
+            :& RNil
+      btnStlState = WidgetState (stl <+> but)
+
+  stateIO <- newIORef btnStlState
+
+  let style = IPythonWidget wid stateIO
+
+  -- Open a comm for this widget, and store it in the kernel state
+  widgetSendOpen style $ toJSON btnStlState
+
+  -- Return the style widget
+  return style
+
+instance IHaskellWidget ToggleButtonsStyle where
+  getCommUUID = uuid
--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs