events, showTitle, markPoint|Line|Area

Author: cryogenian

bower.json

@@ -28,7 +28,8 @@
     "purescript-foreign": "^4.0.0",
     "purescript-dom": "^4.0.0",
     "purescript-transformers": "^3.0.0",
-    "purescript-colors": "^3.0.0"
+    "purescript-colors": "^3.0.0",
+    "purescript-variant": "^3.2.1"
   },
   "devDependencies": {
     "purescript-debug": "^3.0.0",

example/src/Bar.purs

@@ -22,6 +22,7 @@ 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 Utils as U
 
@@ -151,3 +152,4 @@ chart = do
       ch ← EC.init el
       inp ← genInp
       EC.setOption (options inp)  ch
+      EE.listenAll ch DT.traceAnyA

example/src/Main.purs

@@ -25,7 +25,15 @@ import HeatmapCalendar as HeatmapCalendar
 
 import Utils as U
 
-main ∷ ∀ e. Eff (now ∷ NOW, dom ∷ DOM, echarts ∷ ET.ECHARTS, exception ∷ EXCEPTION, random ∷ RANDOM|e) Unit
+main
+  ∷ ∀ e
+  . Eff ( now ∷ NOW
+        , dom ∷ DOM
+        , echarts ∷ ET.ECHARTS
+        , exception ∷ EXCEPTION
+        , random ∷ RANDOM
+        | e )
+      Unit
 main = U.onLoad do
   Line.chart
   Scatter.chart

example/src/Pie.purs

@@ -4,20 +4,16 @@ import Prelude
 
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Exception (EXCEPTION)
-
 import Data.Maybe (Maybe(..))
-
 import Debug.Trace as DT
-
 import DOM (DOM)
 import DOM.Node.Types (ElementId(..))
-
 import ECharts.Chart as EC
+import ECharts.Event as EE
 import ECharts.Types as ET
 import ECharts.Types.Phantom as ETP
 import ECharts.Commands as E
 import ECharts.Monad (DSL)
-
 import Utils as U
 
 options ∷ DSL ETP.OptionI
@@ -86,3 +82,4 @@ chart = do
     Just el → do
       ch ← EC.init el
       EC.setOption options ch
+      EE.listenAll ch DT.traceAnyA

example/src/Scatter.purs

@@ -81,6 +81,15 @@ options sinData cosData = do
 
   E.series do
     E.scatter do
+      E.markPoint do
+        E.label $ E.normal $ E.shown
+        E.buildItems $ E.addItem do
+          E.buildCoord do
+            E.coordXValue "6.0"
+            E.coordY "1.3"
+          E.symbolSize 30
+          E.symbol ET.Rect
+
       E.name "sin"
       E.large true
       E.symbolSize 3

package.json

@@ -7,11 +7,12 @@
   },
   "scripts": {
     "build": "pulp browserify --include example/src --to public/build.js",
-    "serve": "node script/serve.js"
+    "serve": "node script/serve.js",
+    "ide": "purs ide server"
   },
   "dependencies": {
-    "pulp": "^11.0.0",
-    "purescript": "^0.11.4",
-    "purescript-psa": "^0.5.0"
+    "pulp": "^11.0.2",
+    "purescript": "^0.11.6",
+    "purescript-psa": "^0.5.1"
   }
 }

src/ECharts/Commands.purs

@@ -70,6 +70,9 @@ shown = visible true
 hidden ∷ ∀ i. DSL (show ∷ I|i)
 hidden = visible false
 
+showTitle ∷ ∀ i. Boolean → DSL (showTitle ∷ I|i)
+showTitle a = set "showTitle" $ toForeign a
+
 textStyle ∷ ∀ i. DSL TP.TextStyleI → DSL (textStyle ∷ I|i)
 textStyle a = set "textStyle" $ buildObj a
 
@@ -373,6 +376,9 @@ label = set "label" <<< buildObj
 normalLabel ∷ ∀ i. DSL TP.LabelInnerI → DSL (normal ∷ R TP.LabelInnerI|i)
 normalLabel = normal
 
+precision ∷ ∀ i. Number → DSL (precision ∷ I|i)
+precision = set "precision" <<< toForeign
+
 emphasisLabel ∷ ∀ i. DSL TP.LabelInnerI → DSL (emphasis ∷ R TP.LabelInnerI|i)
 emphasisLabel = emphasis
 
@@ -898,6 +904,15 @@ markType = set "type" <<< toForeign
 margin ∷ ∀ i. Int → DSL (margin ∷ I|i)
 margin = set "margin" <<< toForeign
 
+markLine ∷ ∀ i. DSL TP.MarkLineI → DSL (markLine ∷ I|i)
+markLine = set "markLine" <<< buildObj
+
+markPoint ∷ ∀ i. DSL TP.MarkPointI → DSL (markPoint ∷ I|i)
+markPoint = set "markPoint" <<< buildObj
+
+markArea ∷ ∀ i. DSL TP.MarkAreaI → DSL (markArea ∷ I|i)
+markArea = set "markArea" <<< buildObj
+
 repulsion ∷ ∀ i. Number → DSL (repulsion ∷ I|i)
 repulsion = set "repulsion" <<< toForeign
 
@@ -934,6 +949,14 @@ colorSource = set "color" $ toForeign "source"
 colorTarget ∷ ∀ i. DSL (color ∷ I|i)
 colorTarget = set "target" $ toForeign "target"
 
+buildCoord ∷ ∀ i. DSL TP.PointI → DSL (coord ∷ I|i)
+buildCoord dsl =
+  let
+    xx = get "x" dsl
+    yy = get "y" dsl
+  in
+    set "coord" $ toForeign $ Arr.catMaybes [ xx, yy ]
+
 buildCenter ∷ ∀ i. DSL TP.PointI → DSL (center ∷ I|i)
 buildCenter dsl =
   let
@@ -974,6 +997,15 @@ setZ ∷ ∀ i. DSL TP.DimensionI → DSL (z ∷ I|i)
 setZ dsl =
   F.traverse_ (set "z") $ lastWithKeys ["pixels", "percents"] dsl
 
+coordXIx ∷ ∀ i. Int → DSL (x ∷ I|i)
+coordXIx = set "x" <<< toForeign
+
+coordXValue ∷ ∀ i. String → DSL (x ∷ I|i)
+coordXValue = set "x" <<< toForeign
+
+coordY ∷ ∀ i. String → DSL (y ∷ I|i)
+coordY = set "y" <<< toForeign
+
 pixels ∷ ∀ i. Int → DSL (pixels ∷ I|i)
 pixels = set "pixels" <<< toForeign
 
@@ -1037,4 +1069,4 @@ addDateValue dt =
   where
     year' = show <<< fromEnum <<< year
     month' = show <<< fromEnum <<< month
-    day' = show <<< fromEnum <<< day
+    day' = show <<< fromEnum <<< day

src/ECharts/Event.js

@@ -0,0 +1,11 @@
+exports.on_ = function(chart) {
+    return function(eName) {
+        return function(callback) {
+            return function() {
+                return chart.on(eName, function(e) {
+                    callback(e)();
+                });
+            };
+        };
+    };
+};

src/ECharts/Event.purs

@@ -0,0 +1,39 @@
+module ECharts.Event where
+
+import Prelude
+
+import Control.Monad.Eff (Eff)
+import Control.Monad.Except (runExcept)
+import Data.Foldable (for_)
+import Data.Foreign (Foreign, readString)
+import Data.Foreign.Index (readProp)
+import Data.List as L
+import Data.Tuple (Tuple(..))
+import Data.Variant.Internal (RLProxy(..), variantTags, class VariantTags)
+import ECharts.Types (EChartsEvent, EChartsEventR, Chart, ECHARTS)
+import Type.Row (class RowToList)
+import Unsafe.Coerce (unsafeCoerce)
+
+foreign import on_
+  ∷ ∀ e
+  . Chart
+  → String
+  → ( Foreign → Eff (echarts ∷ ECHARTS|e) Unit )
+  → Eff (echarts ∷ ECHARTS|e) Unit
+
+
+listenAll
+  ∷ ∀ e
+  . Chart
+  → ( EChartsEvent → Eff (echarts ∷ ECHARTS|e) Unit )
+  → Eff (echarts ∷ ECHARTS|e) Unit
+listenAll chart cb =
+  for_ eventNames \en → on_ chart en \frn →
+    for_ (runExcept $ readProp "type" frn >>= readString) \tp →
+      when (tp == en) $ cb $ toEChartsEvent $ Tuple tp frn
+  where
+  eventNames ∷ ∀ rl. RowToList EChartsEventR rl ⇒ VariantTags rl ⇒ L.List String
+  eventNames = variantTags (RLProxy ∷ RLProxy rl)
+
+  toEChartsEvent ∷ ∀ ω. Tuple String ω → EChartsEvent
+  toEChartsEvent = unsafeCoerce

src/ECharts/Types.purs

@@ -1,8 +1,10 @@
 module ECharts.Types where
 
 import Prelude
+
 import Control.Monad.Eff (kind Effect)
 import Data.Foreign (Foreign, toForeign)
+import Data.Variant as V
 
 foreign import data Chart ∷ Type
 
@@ -176,3 +178,37 @@ newtype Coord = Coord Foreign
 
 coord ∷ Number → Number → Coord
 coord x y = Coord $ toForeign [ x, y ]
+
+type EChartsEventR =
+  ( click ∷ Foreign
+  , dblclick ∷ Foreign
+  , mousedown ∷ Foreign
+  , mousemove ∷ Foreign
+  , mouseup ∷ Foreign
+  , mouseover ∷ Foreign
+  , mouseout ∷ Foreign
+  , legendselectchanged ∷ Foreign
+  , legendselected ∷ Foreign
+  , legendunselected ∷ Foreign
+  , datazoom ∷ Foreign
+  , datarangeselected ∷ Foreign
+  , timelinechanged ∷ Foreign
+  , timelineplaychanged ∷ Foreign
+  , restore ∷ Foreign
+  , dataviewchanged ∷ Foreign
+  , magictypechanged ∷ Foreign
+  , pieselectchanged ∷ Foreign
+  , pieselected ∷ Foreign
+  , pieunselected ∷ Foreign
+  , mapselectchanged ∷ Foreign
+  , mapselected ∷ Foreign
+  , mapunselected ∷ Foreign
+  , axisareaselected ∷ Foreign
+  , focusNodeAdjancency ∷ Foreign
+  , unfocusNodeAdjacency ∷ Foreign
+  , brush ∷ Foreign
+  , brushselected ∷ Foreign
+  )
+
+
+type EChartsEvent = V.Variant EChartsEventR