Dispaatch changes to callbacks after sending udpate messages to the

frontend. Resolves inconsistency when callbacks trigger frontend calls
as well

Author: Jon M. Mease

Diff for: plotly/basedatatypes.py

@@ -491,13 +491,14 @@ def plotly_restyle(self, restyle_data, trace_indexes=None, **kwargs):
             # The restyle operation resulted in a change to some trace
             # properties, so we dispatch change callbacks and send the
             # restyle message to the frontend (if any)
-            self._dispatch_trace_change_callbacks(
-                restyle_changes, trace_indexes)
             self._send_restyle_msg(
                 restyle_changes,
                 trace_indexes=trace_indexes,
                 source_view_id=source_view_id)
 
+            self._dispatch_trace_change_callbacks(
+                restyle_changes, trace_indexes)
+
         return self
 
     def _perform_plotly_restyle(self, restyle_data, trace_indexes):
@@ -587,8 +588,8 @@ def _restyle_child(self, child, key_path_str, val):
         if not self._in_batch_mode:
             send_val = [val]
             restyle = {key_path_str: send_val}
-            self._dispatch_trace_change_callbacks(restyle, [trace_index])
             self._send_restyle_msg(restyle, trace_indexes=trace_index)
+            self._dispatch_trace_change_callbacks(restyle, [trace_index])
 
         # In batch mode
         # -------------
@@ -1105,11 +1106,12 @@ def plotly_relayout(self, relayout_data, **kwargs):
             # The relayout operation resulted in a change to some layout
             # properties, so we dispatch change callbacks and send the
             # relayout message to the frontend (if any)
-            self._dispatch_layout_change_callbacks(relayout_changes)
             self._send_relayout_msg(
                 relayout_changes,
                 source_view_id=source_view_id)
 
+            self._dispatch_layout_change_callbacks(relayout_changes)
+
         return self
 
     def _perform_plotly_relayout(self, relayout_data):
@@ -1173,8 +1175,8 @@ def _relayout_child(self, child, key_path_str, val):
         # Dispatch change callbacks and send relayout message
         if not self._in_batch_mode:
             relayout_msg = {key_path_str: val}
-            self._dispatch_layout_change_callbacks(relayout_msg)
             self._send_relayout_msg(relayout_msg)
+            self._dispatch_layout_change_callbacks(relayout_msg)
 
         # In batch mode
         # -------------
@@ -1376,6 +1378,16 @@ def plotly_update(self,
             relayout_data=relayout_data,
             trace_indexes=trace_indexes)
 
+        # Send update message
+        # -------------------
+        # Send a plotly_update message to the frontend (if any)
+        if restyle_changes or relayout_changes:
+            self._send_update_msg(
+                restyle_changes,
+                relayout_changes,
+                trace_indexes,
+                source_view_id=source_view_id)
+
         # Dispatch changes
         # ----------------
         # ### Dispatch restyle changes ###
@@ -1387,16 +1399,6 @@ def plotly_update(self,
         if relayout_changes:
             self._dispatch_layout_change_callbacks(relayout_changes)
 
-        # Send update message
-        # -------------------
-        # Send a plotly_update message to the frontend (if any)
-        if restyle_changes or relayout_changes:
-            self._send_update_msg(
-                restyle_changes,
-                relayout_changes,
-                trace_indexes,
-                source_view_id=source_view_id)
-
         return self
 
     def _perform_plotly_update(self, restyle_data=None, relayout_data=None,
@@ -1696,17 +1698,6 @@ def _perform_batch_animate(self, animation_opts):
                                                       relayout_data,
                                                       trace_indexes)
 
-        # Dispatch callbacks
-        # ------------------
-        # ### Dispatch restyle changes ###
-        if restyle_changes:
-            self._dispatch_trace_change_callbacks(restyle_changes,
-                                                  trace_indexes)
-
-        # ### Dispatch relayout changes ###
-        if relayout_changes:
-            self._dispatch_layout_change_callbacks(relayout_changes)
-
         # Convert style / trace_indexes into animate form
         # -----------------------------------------------
         if self._batch_trace_edits:
@@ -1732,6 +1723,17 @@ def _perform_batch_animate(self, animation_opts):
         self._batch_layout_edits.clear()
         self._batch_trace_edits.clear()
 
+        # Dispatch callbacks
+        # ------------------
+        # ### Dispatch restyle changes ###
+        if restyle_changes:
+            self._dispatch_trace_change_callbacks(restyle_changes,
+                                                  trace_indexes)
+
+        # ### Dispatch relayout changes ###
+        if relayout_changes:
+            self._dispatch_layout_change_callbacks(relayout_changes)
+
     # Exports
     # -------
     def to_dict(self):