Added jslink and removed warnings

ihaskell-display/ihaskell-widgets/ihaskell-widgets.cabal

@@ -140,7 +140,7 @@ library
 
 					 -- The singletons package version is locked to the compiler
 					 -- so let cabal choose the right one.
-                     , singletons >= 2.6
+                     , singletons -any
 
   if impl (ghc >= 9.0)
     build-depends:     singletons-base -any

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets.hs

@@ -68,4 +68,4 @@ import           IHaskell.Display.Widgets.Common as X
 import           IHaskell.Display.Widgets.Types as X (setField, getField, properties, triggerDisplay,
                                                       triggerChange, triggerClick, triggerSelection,
                                                       triggerSubmit, ChildWidget(..), StyleWidget(..),
-                                                      WidgetFieldPair(..), Date(..))
+                                                      WidgetFieldPair(..), Date(..), unlink)

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Button.hs

@@ -27,7 +27,6 @@ import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Common
 import           IHaskell.Display.Widgets.Style.ButtonStyle
 import           IHaskell.Display.Widgets.Layout.LayoutWidget
-import           IHaskell.Display.Widgets.Style.DescriptionStyle
 
 -- | A 'Button' represents a Button from IPython.html.widgets.
 type Button = IPythonWidget 'ButtonType

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Controller/Controller.hs

@@ -20,17 +20,13 @@ import           Control.Monad (void)
 
 import           Data.Aeson
 import           Data.Aeson.Types (parse)
-import           Data.Text (Text)
 import           Data.IORef (newIORef)
-import           Data.Maybe (fromJust,isJust)
-import qualified Data.Scientific as Sci
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
 import           IHaskell.IPython.Message.UUID as U
 
-import           IHaskell.Display.Widgets.Singletons (Field, SField)
 import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Common
 import           IHaskell.Display.Widgets.Layout.LayoutWidget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Controller/ControllerAxis.hs

@@ -15,10 +15,8 @@ module IHaskell.Display.Widgets.Controller.ControllerAxis
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
 
-import           Control.Monad (void)
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import qualified Data.Scientific as Sci
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Controller/ControllerButton.hs

@@ -15,10 +15,8 @@ module IHaskell.Display.Widgets.Controller.ControllerButton
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
 
-import           Control.Monad (void)
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import qualified Data.Scientific as Sci
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Layout/Common.hs

@@ -13,15 +13,6 @@
 
 module IHaskell.Display.Widgets.Layout.Common where
 
-import           Data.Aeson
-import           Data.Aeson.Types (emptyObject)
-import           Data.HashMap.Strict as HM
-import           Data.Text (pack, Text)
-import           Data.Typeable (Typeable)
-
-import           IHaskell.Display (IHaskellWidget)
-import           IHaskell.Eval.Widgets (widgetSendClose)
-
 import qualified IHaskell.Display.Widgets.Singletons as S
 
 pattern AlignContent = S.SLAlignContent

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Layout/LayoutWidget.hs

@@ -15,11 +15,8 @@ module IHaskell.Display.Widgets.Layout.LayoutWidget
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
 
-import           Control.Monad (void)
-
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -27,7 +24,6 @@ import           IHaskell.IPython.Message.UUID as U
 
 import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Layout.Types
-import           IHaskell.Display.Widgets.Layout.Common
 
 -- | A 'Layout' represents a Layout from IPython.html.widgets.
 type Layout = IPythonWidget 'LayoutType

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Layout/Types.hs

@@ -24,31 +24,9 @@ import           Prelude hiding (Right,Left)
 import           Control.Monad (unless)
 import qualified Control.Exception as Ex
 
-import           Data.Aeson hiding (pairs)
 import           Data.List (intercalate)
-import           Data.Typeable (Typeable, TypeRep, typeOf)
 
-#if MIN_VERSION_vinyl(0,9,0)
-import           Data.Vinyl (Rec(..), Dict(..))
-import           Data.Vinyl.Recursive ((<+>), recordToList, reifyConstraint, rmap)
-#else
-import           Data.Vinyl (Rec(..), (<+>), recordToList, reifyConstraint, rmap, Dict(..))
-#endif
-import           Data.Vinyl.Lens (rget, rput, type (∈))
-
-#if MIN_VERSION_singletons(3,0,0)
-import           Data.List.Singletons
-#elif MIN_VERSION_singletons(2,4,0)
-import           Data.Singletons.Prelude.List
-#else
-import           Data.Singletons.Prelude ((:++))
-#endif
-
-#if MIN_VERSION_singletons(3,0,0)
-import           Data.Singletons.Base.TH
-#else
-import           Data.Singletons.TH
-#endif
+import           Data.Vinyl (Rec(..))
 
 import qualified IHaskell.Display.Widgets.Singletons as S
 import           IHaskell.Display.Widgets.Types

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Link/DirectionalLink.hs

@@ -10,6 +10,8 @@ module IHaskell.Display.Widgets.Link.DirectionalLink
     DirectionalLink
     -- * Constructor
   , mkDirectionalLink
+    -- * Another constructor
+  , jsdlink
   ) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
@@ -17,8 +19,6 @@ import           Prelude
 
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Monoid (mempty)
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -26,7 +26,6 @@ import           IHaskell.IPython.Message.UUID as U
 
 import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Common
-import           IHaskell.Display.Widgets.Layout.LayoutWidget
 
 -- | An 'DirectionalLink' represents a DirectionalLink widget from IPython.html.widgets.
 type DirectionalLink = IPythonWidget 'DirectionalLinkType
@@ -49,5 +48,13 @@ mkDirectionalLink = do
   -- Return the DirectionalLink widget
   return widget
 
+-- | An easier constructor that links two widgets
+jsdlink :: WidgetFieldPair -> WidgetFieldPair -> IO DirectionalLink
+jsdlink wfp1 wfp2 = do
+  dlink <- mkDirectionalLink
+  _ <- setField dlink Source wfp1
+  _ <- setField dlink Target wfp2
+  return dlink
+
 instance IHaskellWidget DirectionalLink where
   getCommUUID = uuid

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Link/Link.hs

@@ -10,6 +10,8 @@ module IHaskell.Display.Widgets.Link.Link
     Link
     -- * Constructor
   , mkLink
+    -- * Easier constructor
+  , jslink
   ) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
@@ -17,8 +19,6 @@ import           Prelude
 
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Monoid (mempty)
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -26,7 +26,6 @@ import           IHaskell.IPython.Message.UUID as U
 
 import           IHaskell.Display.Widgets.Types
 import           IHaskell.Display.Widgets.Common
-import           IHaskell.Display.Widgets.Layout.LayoutWidget
 
 -- | An 'Link' represents a Link widget from IPython.html.widgets.
 type Link = IPythonWidget 'LinkType
@@ -49,5 +48,13 @@ mkLink = do
   -- Return the link widget
   return widget
 
+-- | An easier constructor that links two widgets
+jslink :: WidgetFieldPair -> WidgetFieldPair -> IO Link
+jslink wfp1 wfp2 = do
+  link <- mkLink
+  _ <- setField link Source wfp1
+  _ <- setField link Target wfp2
+  return link
+
 instance IHaskellWidget Link where
   getCommUUID = uuid

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Media/Audio.hs

@@ -17,7 +17,6 @@ import           Prelude
 
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Monoid (mempty)
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Media/Image.hs

@@ -17,7 +17,6 @@ import           Prelude
 
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Monoid (mempty)
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
@@ -40,9 +39,9 @@ mkImageWidget = do
 
   let mediaAttrs = defaultMediaWidget "ImageView" "ImageModel" layout
       imageAttrs = (ImageFormat =:: PNG)
-              :& (Width =:+ 0)
-              :& (Height =:+ 0)
-              :& RNil
+                   :& (Width =:+ 0)
+                   :& (Height =:+ 0)
+                   :& RNil
       widgetState = WidgetState (mediaAttrs <+> imageAttrs)
 
   stateIO <- newIORef widgetState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Media/Video.hs

@@ -17,7 +17,6 @@ import           Prelude
 
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Monoid (mempty)
 import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Dropdown.hs

@@ -19,7 +19,6 @@ import           Control.Monad (void)
 import           Data.Aeson
 import           Data.IORef (newIORef)
 import qualified Data.Scientific as Sci
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs

@@ -16,9 +16,9 @@
 {-# LANGUAGE StandaloneKindSignatures #-}
 #endif
 
-module IHaskell.Display.Widgets.Singletons where
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 
-import           Data.Kind
+module IHaskell.Display.Widgets.Singletons where
 
 #if MIN_VERSION_singletons(3,0,0)
 import           Data.Singletons.Base.TH

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Password.hs

@@ -18,7 +18,6 @@ import           Prelude
 import           Control.Monad (when)
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Text.hs

@@ -18,7 +18,6 @@ import           Prelude
 import           Control.Monad (when)
 import           Data.Aeson
 import           Data.IORef (newIORef)
-import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -54,7 +53,7 @@ mkTextWidget = do
 
 instance IHaskellWidget TextWidget where
   getCommUUID = uuid
-  -- Two possibilities: 1. content -> event -> "submit" 2. sync_data -> value -> <new_value>
+  -- Two possibilities: 1. content -> event -> "submit" 2. state -> value -> <new_value>
   comm tw val _ = do
     case nestedObjectLookup val ["state", "value"] of
       Just (String value) -> setField' tw StringValue value >> triggerChange tw

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Style/DescriptionStyle.hs

@@ -17,14 +17,12 @@ 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 'DescriptionStyle' represents a Button Style from IPython.html.widgets.
 type DescriptionStyle = IPythonWidget 'DescriptionStyleType

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs

@@ -108,7 +108,7 @@ import           Data.Text.Lazy.Encoding
 import           GHC.IO.Exception
 
 import           IHaskell.Eval.Widgets (widgetSendUpdate, widgetSendView)
-import           IHaskell.Display (Base64, IHaskellWidget(..), IHaskellDisplay(..), Display(..), widgetdisplay, base64)
+import           IHaskell.Display (IHaskellWidget(..), IHaskellDisplay(..), Display(..), widgetdisplay, base64)
 import           IHaskell.IPython.Message.UUID
 
 import           IHaskell.Display.Widgets.Singletons (Field, SField, toKey, HasKey)
@@ -965,4 +965,13 @@ instance FromJSON Date where
     <*> ((+1) <$> v .: "month")
     <*> v .: "date"
   parseJSON Null = pure NullDate
-  parseJSON _ = mzero
\ No newline at end of file
+  parseJSON _ = mzero
+
+-- | Allows you to unlink a jslink
+unlink :: ('S.Source ∈ WidgetFields w, 'S.Target ∈ WidgetFields w, IHaskellWidget (IPythonWidget w))
+       => IPythonWidget w
+       -> IO (IPythonWidget w)
+unlink w = do
+  _ <- setField' w Source EmptyWT
+  _ <- setField' w Target EmptyWT
+  return w
\ No newline at end of file

src/IHaskell/Eval/Widgets.hs

-{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-}
+{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules, CPP #-}
 module IHaskell.Eval.Widgets (
     widgetSendOpen,
     widgetSendView,
@@ -18,13 +18,11 @@ import           Control.Concurrent.STM (atomically)
 import           Control.Concurrent.STM.TChan
 import           Control.Monad (foldM)
 import           Data.Aeson
-import           Data.Aeson.Types (emptyArray)
-import           Data.ByteString.Lazy (toStrict)
 import           Data.ByteString.Base64 as B64 (decodeLenient)
 import qualified Data.Map as Map
 import           Data.Text.Encoding (encodeUtf8)
 import           Data.HashMap.Strict as HM (lookup,insert,delete)
-import           Data.Functor ((<&>))
+
 import           Data.Foldable (foldl)
 import           System.IO.Unsafe (unsafePerformIO)
 
@@ -33,6 +31,14 @@ import           IHaskell.Eval.Util (unfoldM)
 import           IHaskell.IPython.Types (showMessageType)
 import           IHaskell.Types
 
+#if MIN_VERSION_base(4,11,0)
+import           Data.Functor ((<&>))
+#else
+(<&>) :: Functor f => f a -> (a -> b) -> f b
+a <&> f = fmap f a
+infixl 1 <&>
+#endif
+
 -- All comm_open messages go here
 widgetMessages :: TChan WidgetMsg
 {-# NOINLINE widgetMessages #-}