fix save drawings bug, ensure html files are copied into package

lightweight_charts/widgets.py

@@ -73,19 +73,29 @@ class WxChart(abstract.AbstractChart):
         super().__init__(abstract.Window(self.webview.RunScript, 'window.wx_msg.postMessage.bind(window.wx_msg)'),
                          inner_width, inner_height, scale_candles_only, toolbox)
 
-        self.webview.Bind(wx.html2.EVT_WEBVIEW_LOADED, lambda e: wx.CallLater(1000, self.win.on_js_load))
+        self.first = True
+        def on_load(e):
+            if self.first is True:
+                self.first = False
+                print("first")
+                return
+            print('second')
+            # wx.CallLater(2000, self.win.on_js_load)
+            # wx.CallLater(2000, self.webview.RunScript('alert(Object.keys(window))'))
+
+        self.webview.Bind(wx.html2.EVT_WEBVIEW_LOADED, on_load)
         self.webview.Bind(wx.html2.EVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, lambda e: emit_callback(self, e.GetString()))
         self.webview.AddScriptMessageHandler('wx_msg')
 
-        self.webview.LoadURL(f'file:///{abstract.INDEX}')
-
         # with open(abstract.INDEX, 'r') as f:
         #     html = f.read()
         #     self.webview.SetPage(html,  '/Users/louis/Projects/lightweight-charts-python/lightweight_charts/js/')
 
 
-        # with open('/Users/louis/Projects/lightweight-charts-python/lightweight_charts/js/bundle.js', 'r') as f:
+        self.webview.LoadURL("file://"+abstract.INDEX)
-            # self.webview.AddUserScript(f.read())
+
+        with open('/Users/louis/Projects/lightweight-charts-python/lightweight_charts/js/bundle.js', 'r') as f:
+            self.webview.AddUserScript(f.read())
         # self.webview.AddUserScript(abstract.JS['toolbox']) if toolbox else None
 
     def get_webview(self): return self.webview

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as f:
 
 setup(
     name='lightweight_charts',
-    version='1.0.20',
+    version='2.0',
     packages=find_packages(),
     python_requires='>=3.8',
     install_requires=[
@@ -13,7 +13,7 @@ setup(
         'pywebview>=5.0.5',
     ],
     package_data={
-        'lightweight_charts': ['js/*.js'],
+        'lightweight_charts': ['js/*'],
     },
     author='louisnw',
     license='MIT',

src/general/toolbox.ts

@@ -140,6 +140,7 @@ export class ToolBox {
         const drawingMeta = []
         for (const d of this._drawingTool.drawings) {
             drawingMeta.push({
+                type: d._type,
                 points: d.points,
                 options: d._options
             });