unified actions and events

Author: cryogenian

example/src/Bar.purs

@@ -7,23 +7,23 @@ import Color as C
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Exception (EXCEPTION)
 import Control.Monad.Eff.Random (RANDOM, random)
-
+import DOM (DOM)
+import DOM.Node.Types (ElementId(..))
 import Data.Array as Arr
-import Data.Traversable as F
+import Data.Foreign (toForeign)
 import Data.Maybe (Maybe(..))
-
+import Data.Newtype (wrap)
+import Data.Symbol (SProxy(..))
+import Data.Traversable as F
+import Data.Tuple (Tuple(..))
+import Data.Variant as V
 import Debug.Trace as DT
-
-import DOM (DOM)
-import DOM.Node.Types (ElementId(..))
-
 import ECharts.Chart as EC
-import ECharts.Types as ET
-import ECharts.Monad (DSL)
-import ECharts.Types.Phantom as ETP
 import ECharts.Commands as E
 import ECharts.Event as EE
-
+import ECharts.Monad (DSL)
+import ECharts.Types as ET
+import ECharts.Types.Phantom as ETP
 import Utils as U
 
 itemStyle ∷ DSL ETP.ItemStyleI
@@ -153,3 +153,23 @@ chart = do
       inp ← genInp
       EC.setOption (options inp)  ch
       EE.listenAll ch DT.traceAnyA
+      EE.dispatch (V.inj (SProxy ∷ SProxy "brush") $ toForeign evt) ch
+  where
+  evt =
+    { batch:
+      [ { areas:
+          [ { brushType: "rect"
+            , brushMode: "single"
+            , range:
+                [ [ 610
+                  , 885
+                  ]
+                , [ 236
+                  , 423
+                  ]
+                ]
+            }
+          ]
+        }
+      ]
+    }

example/src/Pie.purs

@@ -4,7 +4,10 @@ import Prelude
 
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Exception (EXCEPTION)
+import Data.Foreign (toForeign)
 import Data.Maybe (Maybe(..))
+import Data.Symbol (SProxy(..))
+import Data.Variant as V
 import Debug.Trace as DT
 import DOM (DOM)
 import DOM.Node.Types (ElementId(..))
@@ -46,6 +49,7 @@ options = do
           E.name "three"
     E.pie do
       E.name "Outer"
+      E.selectedMode ET.Multiple
       E.radius $ ET.Radius { start: ET.Percent 40.0, end: ET.Percent 55.0 }
       E.buildItems do
         E.addItem do
@@ -83,3 +87,11 @@ chart = do
       ch ← EC.init el
       EC.setOption options ch
       EE.listenAll ch DT.traceAnyA
+      EE.dispatch
+        (V.inj (SProxy ∷ SProxy "pieselected")
+           $ toForeign { seriesIndex: [1]
+                       , seriesName: []
+                       , dataIndex: Nothing
+                       , name: Just "seven"
+                       })
+        ch

example/src/Scatter.purs

@@ -22,10 +22,9 @@ import ECharts.Types as ET
 import ECharts.Types.Phantom as ETP
 import ECharts.Commands as E
 import ECharts.Monad (DSL)
-
 import Math (cos, sin, (%))
-
 import Utils as U
+import Unsafe.Coerce (unsafeCoerce)
 
 genSinData ∷ ∀ e. Eff (random ∷ RANDOM|e) (Array ET.Item)
 genSinData = do

src/ECharts/Commands.purs

@@ -430,33 +430,69 @@ textMiddle = set "textBaseline" $ toForeign "middle"
 brush ∷ ∀ i. DSL TP.BrushI → DSL (brush ∷ I|i)
 brush = set "brush" <<< buildObj
 
+brushType ∷ ∀ i. DSL TP.BrushToolboxI → DSL (brushType ∷ I|i)
+brushType a = set "type" $ buildArr a
+
 brushToolbox ∷ ∀ i. DSL TP.BrushToolboxI → DSL (brushToolbox ∷ I|i)
 brushToolbox a =  set "toolbox" $ buildArr a
 
+brushModeSingle ∷ ∀ i. DSL (brushMode ∷ I|i)
+brushModeSingle = set "brushMode" $ toForeign "single"
+
+brushIcons ∷ ∀ i. DSL TP.BFFieldI → DSL (bfIcon ∷ I|i)
+brushIcons a = set "icon" $ buildObj a
+
+brushTitle ∷ ∀ i. DSL TP.BFFieldI → DSL (bfTitle ∷ I|i)
+brushTitle a = set "title" $ buildObj a
+
+brushModeMultiple ∷ ∀ i. DSL (brushMode ∷ I|i)
+brushModeMultiple = set "brushMode" $ toForeign "multiple"
+
 rect ∷ ∀ i. DSL (tool ∷ I|i)
 rect = set "" $ toForeign "rect"
 
+setRect ∷ ∀ i. String → DSL (rect ∷ I|i)
+setRect a = set "rect" $ toForeign a
+
 polygon ∷ ∀ i. DSL (tool ∷ I|i)
 polygon = set "" $ toForeign "polygon"
 
+setPolygon ∷ ∀ i. String → DSL (polygon ∷ I|i)
+setPolygon a = set "polygon" $ toForeign a
+
 lineX ∷ ∀ i. DSL (tool ∷ I|i)
 lineX = set "" $ toForeign "lineX"
 
+setLineX ∷ ∀ i. String → DSL (lineX ∷ I|i)
+setLineX a = set "lineX" $ toForeign a
+
 lineY ∷ ∀ i. DSL (tool ∷ I|i)
 lineY = set "" $ toForeign "lineY"
 
+setLineY ∷ ∀ i. String → DSL (lineY ∷ I|i)
+setLineY a = set "lineY" $ toForeign a
+
 keep ∷ ∀ i. DSL (tool ∷ I|i)
 keep = set "" $ toForeign "keep"
 
+setKeep ∷ ∀ i. String → DSL (keep ∷ I|i)
+setKeep a = set "keep" $ toForeign a
+
 clear ∷ ∀ i. DSL (tool ∷ I|i)
 clear = set "" $ toForeign "clear"
 
+setClear ∷ ∀ i. String → DSL (clear ∷ I|i)
+setClear a = set "clear" $ toForeign a
+
 toolbox ∷ ∀ i. DSL TP.ToolboxI → DSL (toolbox ∷ I|i)
 toolbox a = set "toolbox" $ buildObj a
 
 feature ∷ ∀ i. DSL TP.FeatureI → DSL (feature ∷ I|i)
 feature a = set "feature" $ buildObj a
 
+brushFeature ∷ ∀ i. DSL TP.BrushFeatureI → DSL (brush ∷ I|i)
+brushFeature a = set "brush" $ buildObj a
+
 magicType ∷ ∀ i. DSL TP.MagicTypeI → DSL (magicType ∷ I|i)
 magicType a = set "magicType" $ buildObj a
 

src/ECharts/Event.js

@@ -3,9 +3,41 @@ exports.on_ = function(chart) {
         return function(callback) {
             return function() {
                 return chart.on(eName, function(e) {
+                    console.log(e);
                     callback(e)();
                 });
             };
         };
     };
 };
+
+exports.dispatchAction_ = function(maybeKeys) {
+    return function(maybe) {
+        return function(rawAction) {
+            return function(chart) {
+                return function() {
+                    var keys = Object.keys(rawAction),
+                        i, key, value, keysArr,
+                        action = {};
+                    for (i = 0; i < keys.length; i++) {
+                        key = keys[i];
+                        if (typeof maybeKeys[rawAction.type] === "undefined") {
+                            keysArr = [];
+                        } else {
+                            keysArr = maybeKeys[rawAction.type];
+                        }
+                        if (keysArr.indexOf(key) == -1) {
+                            value = rawAction[key];
+                        } else {
+                            value = maybe(undefined)(function(x) {return x;})(rawAction[key]);
+                        }
+                        if (typeof value !== "undefined") {
+                            action[key] = value;
+                        }
+                    }
+                    chart.dispatchAction(action);
+                };
+            };
+        };
+    };
+}

src/ECharts/Event.purs

@@ -3,12 +3,16 @@ module ECharts.Event where
 import Prelude
 
 import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Class (liftEff, class MonadEff)
 import Control.Monad.Except (runExcept)
 import Data.Foldable (for_)
 import Data.Foreign (Foreign, readString)
 import Data.Foreign.Index (readProp)
+import Data.Maybe as M
 import Data.List as L
-import Data.Tuple (Tuple(..))
+import Data.Record.Unsafe as R
+import Data.StrMap as SM
+import Data.Tuple (Tuple(..), fst, snd)
 import Data.Variant.Internal (RLProxy(..), variantTags, class VariantTags)
 import ECharts.Types (EChartsEvent, EChartsEventR, Chart, ECHARTS)
 import Type.Row (class RowToList)
@@ -21,13 +25,13 @@ foreign import on_
   → ( Foreign → Eff (echarts ∷ ECHARTS|e) Unit )
   → Eff (echarts ∷ ECHARTS|e) Unit
 
-
 listenAll
-  ∷ ∀ e
-  . Chart
+  ∷ ∀ e m
+  . MonadEff ( echarts ∷ ECHARTS |e ) m
+  ⇒ Chart
   → ( EChartsEvent → Eff (echarts ∷ ECHARTS|e) Unit )
-  → Eff (echarts ∷ ECHARTS|e) Unit
-listenAll chart cb =
+  → m Unit
+listenAll chart cb = liftEff $
   for_ eventNames \en → on_ chart en \frn →
     for_ (runExcept $ readProp "type" frn >>= readString) \tp →
       when (tp == en) $ cb $ toEChartsEvent $ Tuple tp frn
@@ -37,3 +41,58 @@ listenAll chart cb =
 
   toEChartsEvent ∷ ∀ ω. Tuple String ω → EChartsEvent
   toEChartsEvent = unsafeCoerce
+
+foreign import dispatchAction_
+  ∷ ∀ e a b action
+  . SM.StrMap (Array String) -- mapping from action type to keys that are maybe's
+  → ( b → (a → b) → M.Maybe a → b ) -- maybe
+  → action
+  → Chart
+  → Eff ( echarts ∷ ECHARTS |e ) Unit
+
+dispatch
+  ∷ ∀ e m
+  . MonadEff ( echarts ∷ ECHARTS | e ) m
+  ⇒ EChartsEvent
+  → Chart
+  → m Unit
+dispatch vaction chart =
+  liftEff $ dispatchAction_ strmapConfig M.maybe action chart
+  where
+  strmapConfig = SM.fromFoldable
+    [ Tuple "highlight" ["name", "dataIndex"]
+    , Tuple "downplay" ["name", "dataIndex"]
+    , Tuple "mapSelect" ["name", "dataIndex"]
+    , Tuple "mapUnSelect" ["name", "dataIndex"]
+    , Tuple "mapToggleSelect" ["name", "dataIndex"]
+    , Tuple "pieSelect" ["name", "dataIndex"]
+    , Tuple "pieUnSelect" ["name", "dataIndex"]
+    , Tuple "pieToggleSelect" ["name", "dataIndex"]
+    , Tuple "focusNodeAdjacency" ["seriesId", "seriesIndex", "seriesName"]
+    , Tuple "unfocusNodeAdjacency" ["seriesId", "seriesIndex", "seriesName"]
+    ]
+
+  variantPair ∷ Tuple String {}
+  variantPair = unsafeCoerce vaction
+
+  actionType ∷ String
+  actionType = case fst variantPair of
+    "legendselectchanged" → "legendToggleSelect"
+    "legendselected" → "legendSelect"
+    "legendunselected" → "legendUnSelect"
+    "datazoom" → "dataZoom"
+    "datarangeselected" → "selectDataRange"
+    "timelinechanged" → "timelineChange"
+    "timelineplaychanged" → "timelinePlayChange"
+    "pieselectchanged" → "pieToggleSelect"
+    "pieselected" → "pieSelect"
+    "pieunselected" → "pieUnSelect"
+    "mapselectchanged" → "mapToggleSelect"
+    "mapselected" → "mapSelect"
+    "mapunselected" → "mapUnSelect"
+    "focusnodeadjacency" → "focusNodeAdjacency"
+    "unfocusnodeadjacency" → "unfocusNodeAdjacency"
+    s → s
+
+  action ∷ ∀ ω. { "type" ∷ String | ω }
+  action = R.unsafeSet "type" actionType $ snd variantPair

src/ECharts/Types.purs

@@ -4,7 +4,10 @@ import Prelude
 
 import Control.Monad.Eff (kind Effect)
 import Data.Foreign (Foreign, toForeign)
+import Data.Maybe (Maybe)
+import Data.Symbol (SProxy(..))
 import Data.Variant as V
+import Data.StrMap as SM
 
 foreign import data Chart ∷ Type
 
@@ -208,7 +211,8 @@ type EChartsEventR =
   , unfocusNodeAdjacency ∷ Foreign
   , brush ∷ Foreign
   , brushselected ∷ Foreign
+  , pieSelect ∷ Foreign
+  , pieUnSelect ∷ Foreign
   )
 
-
 type EChartsEvent = V.Variant EChartsEventR