@perspective-dev/viewer 5.5.1 → 5.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (206) hide show
  1. package/README.md +82 -3
  2. package/dist/cdn/perspective-viewer.js +9 -9
  3. package/dist/cdn/perspective-viewer.js.map +4 -4
  4. package/dist/css/blueprint.css +1 -1
  5. package/dist/css/botanical.css +1 -1
  6. package/dist/css/dracula.css +1 -1
  7. package/dist/css/eggplant.css +1 -1
  8. package/dist/css/gruvbox-dark.css +1 -1
  9. package/dist/css/gruvbox.css +1 -1
  10. package/dist/css/icons.css +1 -1
  11. package/dist/css/intl/ar.css +1 -1
  12. package/dist/css/intl/de.css +1 -1
  13. package/dist/css/intl/es.css +1 -1
  14. package/dist/css/intl/fr.css +1 -1
  15. package/dist/css/intl/ja.css +1 -1
  16. package/dist/css/intl/pt.css +1 -1
  17. package/dist/css/intl/zh.css +1 -1
  18. package/dist/css/intl.css +1 -1
  19. package/dist/css/ledger.css +1 -1
  20. package/dist/css/monokai.css +1 -1
  21. package/dist/css/nord.css +1 -1
  22. package/dist/css/phosphor.css +1 -1
  23. package/dist/css/pro-dark.css +1 -1
  24. package/dist/css/pro.css +1 -1
  25. package/dist/css/solarized-dark.css +1 -1
  26. package/dist/css/solarized.css +1 -1
  27. package/dist/css/themes.css +1 -1
  28. package/dist/css/vaporwave.css +1 -1
  29. package/dist/css/velvet.css +1 -1
  30. package/dist/docs/perspective-docs.json +1 -1
  31. package/dist/esm/column-format.js +2 -0
  32. package/dist/esm/column-format.js.map +7 -0
  33. package/dist/esm/extensions.d.ts +3 -13
  34. package/dist/esm/perspective-viewer.d.ts +1 -1
  35. package/dist/esm/perspective-viewer.js +9 -9
  36. package/dist/esm/perspective-viewer.js.map +4 -4
  37. package/dist/esm/plugin.d.ts +4 -1
  38. package/dist/esm/select-detail.d.ts +15 -0
  39. package/dist/esm/select-detail.js +2 -0
  40. package/dist/esm/select-detail.js.map +7 -0
  41. package/dist/esm/ts-rs/DerivedTableConfig.d.ts +35 -0
  42. package/dist/esm/ts-rs/Layout.d.ts +2 -2
  43. package/dist/esm/ts-rs/Orientation.d.ts +2 -1
  44. package/dist/esm/ts-rs/PanelViewerConfig.d.ts +7 -6
  45. package/dist/esm/ts-rs/RestoreOptions.d.ts +3 -7
  46. package/dist/esm/ts-rs/SplitLayout.d.ts +13 -0
  47. package/dist/esm/ts-rs/TabLayout.d.ts +3 -0
  48. package/dist/esm/ts-rs/TableRef.d.ts +9 -0
  49. package/dist/esm/ts-rs/ViewerConfig.d.ts +7 -6
  50. package/dist/esm/ts-rs/ViewerConfigUpdate.d.ts +7 -5
  51. package/dist/esm/ts-rs/WorkspaceConfig.d.ts +9 -1
  52. package/dist/esm/ts-rs/WorkspaceConfigUpdate.d.ts +11 -1
  53. package/dist/wasm/perspective-viewer.d.ts +115 -35
  54. package/dist/wasm/perspective-viewer.js +312 -188
  55. package/dist/wasm/perspective-viewer.wasm +0 -0
  56. package/dist/wasm/perspective-viewer.wasm.d.ts +21 -17
  57. package/package.json +32 -19
  58. package/src/css/column-selector.css +205 -50
  59. package/src/css/ui/containers/context-menu.css +12 -1
  60. package/src/css/ui/containers/dropdown-menu-items.css +29 -0
  61. package/src/css/ui/containers/scroll-panel.css +4 -1
  62. package/src/rust/agent/client/protocol.rs +0 -89
  63. package/src/rust/agent/markdown/mod.rs +0 -238
  64. package/src/rust/agent/preamble.md +3 -0
  65. package/src/rust/agent/tools.rs +282 -17
  66. package/src/rust/components/column_selector/active_column.rs +15 -5
  67. package/src/rust/components/column_selector/add_expression_button.rs +9 -26
  68. package/src/rust/components/column_selector/config_selector.rs +35 -7
  69. package/src/rust/components/column_selector/derived_control.rs +229 -0
  70. package/src/rust/components/column_selector/expr_edit_button.rs +3 -2
  71. package/src/rust/components/column_selector/filter_column.rs +2 -4
  72. package/src/rust/components/column_selector/inactive_column.rs +4 -5
  73. package/src/rust/components/column_selector/pivot_column.rs +21 -1
  74. package/src/rust/components/column_selector/sort_column.rs +4 -3
  75. package/src/rust/components/column_selector.rs +21 -1
  76. package/src/rust/components/column_settings_sidebar/save_settings.rs +5 -3
  77. package/src/rust/components/column_settings_sidebar/style_tab/symbol/row_selector.rs +1 -1
  78. package/src/rust/components/column_settings_sidebar/style_tab.rs +1 -0
  79. package/src/rust/components/column_settings_sidebar.rs +25 -19
  80. package/src/rust/components/debug_panel.rs +38 -29
  81. package/src/rust/components/dragdrop_list.rs +8 -9
  82. package/src/rust/components/empty_row.rs +3 -3
  83. package/src/rust/components/filter_dropdown.rs +100 -101
  84. package/src/rust/components/main_panel/msg.rs +6 -4
  85. package/src/rust/components/main_panel/reconcile.rs +67 -25
  86. package/src/rust/components/main_panel/render.rs +70 -51
  87. package/src/rust/components/main_panel/update.rs +20 -21
  88. package/src/rust/components/main_panel.rs +87 -60
  89. package/src/rust/components/new_panel_menu.rs +69 -1
  90. package/src/rust/components/panel_menu.rs +63 -12
  91. package/src/rust/components/plugin_tab.rs +3 -2
  92. package/src/rust/components/render_warning.rs +2 -1
  93. package/src/rust/components/settings_panel.rs +4 -4
  94. package/src/rust/components/status_bar.rs +74 -24
  95. package/src/rust/components/status_indicator.rs +8 -1
  96. package/src/rust/components/viewer/filters.rs +13 -1
  97. package/src/rust/components/viewer/msg.rs +4 -0
  98. package/src/rust/components/viewer/panels.rs +41 -1
  99. package/src/rust/components/viewer/render.rs +1 -0
  100. package/src/rust/components/viewer/settings.rs +0 -22
  101. package/src/rust/components/viewer/snapshots.rs +2 -2
  102. package/src/rust/components/viewer/wiring.rs +14 -0
  103. package/src/rust/components/viewer.rs +45 -25
  104. package/src/rust/components/window_editor.rs +5 -4
  105. package/src/rust/config/column_config_schema.rs +38 -377
  106. package/src/rust/config/number_string_format.rs +0 -94
  107. package/src/rust/config/options.rs +3 -7
  108. package/src/rust/config/plugin_static_config.rs +0 -42
  109. package/src/rust/config/viewer_config.rs +47 -17
  110. package/src/rust/config/workspace_config.rs +160 -129
  111. package/src/rust/custom_elements/viewer.rs +187 -131
  112. package/src/rust/custom_events.rs +33 -18
  113. package/src/rust/derived.rs +266 -0
  114. package/src/rust/exprtk/tokenize.rs +0 -54
  115. package/src/rust/js/plugin.rs +1 -1
  116. package/src/rust/js/regular_layout.rs +225 -3
  117. package/src/rust/lib.rs +3 -0
  118. package/src/rust/presentation.rs +23 -4
  119. package/src/rust/queries/column_locator.rs +55 -48
  120. package/src/rust/queries/get_viewer_config.rs +1 -1
  121. package/src/rust/queries/plugin_column_styles.rs +22 -23
  122. package/src/rust/renderer/dispatch.rs +2 -0
  123. package/src/rust/renderer/plugin_config.rs +652 -487
  124. package/src/rust/renderer/props.rs +4 -0
  125. package/src/rust/renderer/registry.rs +2 -6
  126. package/src/rust/renderer/state.rs +205 -0
  127. package/src/rust/renderer.rs +201 -59
  128. package/src/rust/session/metadata.rs +30 -9
  129. package/src/rust/session/op_queue.rs +430 -0
  130. package/src/rust/session/panel_state.rs +327 -0
  131. package/src/rust/session/view_subscription.rs +42 -3
  132. package/src/rust/session.rs +900 -395
  133. package/src/rust/tasks/apply_global_filters.rs +49 -35
  134. package/src/rust/tasks/auto_pause.rs +22 -12
  135. package/src/rust/tasks/copy_export.rs +5 -0
  136. package/src/rust/tasks/create_panel.rs +34 -9
  137. package/src/rust/tasks/derive.rs +312 -0
  138. package/src/rust/tasks/mod.rs +6 -2
  139. package/src/rust/tasks/pipeline.rs +145 -89
  140. package/src/rust/tasks/reset_all.rs +31 -20
  141. package/src/rust/tasks/restore_derived.rs +200 -0
  142. package/src/rust/tasks/restore_panel.rs +153 -141
  143. package/src/rust/tasks/send_column_config.rs +56 -29
  144. package/src/rust/tasks/send_plugin_config.rs +52 -23
  145. package/src/rust/tasks/set_edit_mode.rs +33 -25
  146. package/src/rust/tasks/sync_update_panels.rs +30 -12
  147. package/src/rust/tasks/table_lifecycle.rs +70 -34
  148. package/src/rust/tasks/transactional_restore.rs +387 -0
  149. package/src/rust/tasks/update_theme.rs +45 -6
  150. package/src/rust/ui/containers/scroll_panel.rs +17 -10
  151. package/src/rust/ui/containers/split_panel.rs +0 -41
  152. package/src/rust/ui/context_menu.rs +157 -18
  153. package/src/rust/ui/font_loader.rs +23 -35
  154. package/src/rust/ui/form/mirrored_textarea.rs +0 -12
  155. package/src/rust/ui/form/multi_stop_gradient_selector.rs +0 -89
  156. package/src/rust/ui/form/palette_selector.rs +0 -51
  157. package/src/rust/ui/portal.rs +4 -10
  158. package/src/rust/utils/browser/mod.rs +2 -3
  159. package/src/{ts/perspective-viewer.inline.ts → rust/utils/browser/mouse.rs} +11 -10
  160. package/src/rust/utils/browser/request_animation_frame.rs +27 -8
  161. package/src/rust/utils/css.rs +0 -360
  162. package/src/rust/utils/local_fonts.rs +0 -36
  163. package/src/rust/utils/mod.rs +2 -3
  164. package/src/rust/utils/modal_position.rs +15 -21
  165. package/src/rust/utils/{browser/tests/mod.rs → plugin_host_state.rs} +31 -1
  166. package/src/rust/utils/pubsub.rs +0 -1
  167. package/src/rust/workspace.rs +187 -140
  168. package/src/svg/derived.svg +6 -0
  169. package/src/themes/icons.css +1 -0
  170. package/src/themes/intl/ar.css +11 -0
  171. package/src/themes/intl/de.css +11 -0
  172. package/src/themes/intl/es.css +11 -0
  173. package/src/themes/intl/fr.css +11 -0
  174. package/src/themes/intl/ja.css +11 -0
  175. package/src/themes/intl/pt.css +11 -0
  176. package/src/themes/intl/zh.css +11 -0
  177. package/src/themes/intl.css +11 -0
  178. package/src/ts/extensions.ts +3 -36
  179. package/src/ts/perspective-viewer.ts +1 -1
  180. package/src/ts/plugin.ts +4 -1
  181. package/src/{rust/utils/tests/request_animation_frame.rs → ts/select-detail.ts} +32 -26
  182. package/src/ts/ts-rs/DerivedTableConfig.ts +22 -0
  183. package/src/ts/ts-rs/Layout.ts +2 -2
  184. package/src/ts/ts-rs/Orientation.ts +2 -1
  185. package/src/ts/ts-rs/PanelViewerConfig.ts +7 -6
  186. package/src/ts/ts-rs/RestoreOptions.ts +3 -7
  187. package/src/ts/ts-rs/SplitLayout.ts +17 -1
  188. package/src/ts/ts-rs/TabLayout.ts +3 -0
  189. package/src/ts/ts-rs/TableRef.ts +9 -0
  190. package/src/ts/ts-rs/ViewerConfig.ts +7 -6
  191. package/src/ts/ts-rs/ViewerConfigUpdate.ts +7 -5
  192. package/src/ts/ts-rs/WorkspaceConfig.ts +7 -1
  193. package/src/ts/ts-rs/WorkspaceConfigUpdate.ts +9 -1
  194. package/dist/esm/perspective-viewer.inline.d.ts +0 -3
  195. package/dist/esm/perspective-viewer.inline.js +0 -21
  196. package/dist/esm/perspective-viewer.inline.js.map +0 -7
  197. package/src/rust/tasks/restore_and_render.rs +0 -107
  198. package/src/rust/utils/browser/tests/debounce.rs +0 -163
  199. package/src/rust/utils/tests/mod.rs +0 -14
  200. package/src/rust/utils/tests/pubsub.rs +0 -95
  201. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline0.js +0 -0
  202. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline1.js +0 -0
  203. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline2.js +0 -0
  204. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline3.js +0 -0
  205. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline4.js +0 -0
  206. /package/dist/wasm/snippets/{perspective-viewer-6813b568219c6763 → perspective-viewer-7fc45549159e01e4}/inline5.js +0 -0
@@ -257,9 +257,9 @@ impl Component for ActiveColumn {
257
257
  };
258
258
 
259
259
  let ondragenter = ctx.props().ondragenter.reform(move |event: DragEvent| {
260
- // Safari does not set `relatedTarget` so this event must be allowed to
261
- // bubble so we can count entry/exit stacks to determine true
262
- // `"dragleave"`.
260
+ // Safari does not set `relatedTarget` so this event must be allowed
261
+ // to bubble so we can count entry/exit stacks to
262
+ // determine true `"dragleave"`.
263
263
  if event.related_target().is_some() {
264
264
  event.stop_propagation();
265
265
  event.prevent_default();
@@ -328,7 +328,7 @@ impl Component for ActiveColumn {
328
328
  let remove_column = if is_required {
329
329
  None
330
330
  } else {
331
- Some(ctx.link().callback({
331
+ Some(left_click(ctx.link().callback({
332
332
  let event_name = name.to_owned();
333
333
  move |event: MouseEvent| {
334
334
  ActiveColumnMsg::DeactivateColumn(
@@ -336,7 +336,7 @@ impl Component for ActiveColumn {
336
336
  event.shift_key(),
337
337
  )
338
338
  }
339
- }))
339
+ })))
340
340
  };
341
341
 
342
342
  let ondragend = &ctx.props().ondragend.reform(|_| ());
@@ -367,9 +367,11 @@ impl Component for ActiveColumn {
367
367
  if is_required {
368
368
  class.push("required");
369
369
  };
370
+
370
371
  if !is_required {
371
372
  class.push("shift-alt-icon");
372
373
  }
374
+
373
375
  html! {
374
376
  <div
375
377
  class={outer_classes}
@@ -468,6 +470,14 @@ impl ActiveColumnProps {
468
470
  fn get_is_required(&self, idx: usize) -> bool {
469
471
  let min_cols = self.renderer.metadata().min_config_columns.unwrap_or(0);
470
472
  idx < min_cols
473
+ && (self
474
+ .session
475
+ .get_view_config()
476
+ .columns
477
+ .iter()
478
+ .flatten()
479
+ .count()
480
+ == 1)
471
481
  }
472
482
 
473
483
  fn get_aggregate(&self, name: &str) -> Option<Aggregate> {
@@ -13,6 +13,7 @@
13
13
  use yew::prelude::*;
14
14
 
15
15
  use super::{ColumnLocator, ColumnSettingsTarget};
16
+ use crate::utils::left_click;
16
17
 
17
18
  #[derive(Clone, PartialEq, Properties)]
18
19
  pub struct AddExpressionButtonProps {
@@ -23,41 +24,23 @@ pub struct AddExpressionButtonProps {
23
24
  pub selected_column: Option<ColumnLocator>,
24
25
  }
25
26
 
26
- /// `onmouseover` is triggered incorrectly on the `DragTarget` of a
27
- /// drag/drop action after `DropEvent` has fired on the `DropTarget`,
28
- /// causing brief hover effects where the mouse _was_ before the action
29
- /// initiated. Various methods of correcting this were attempted, settling
30
- /// on a manual `dragdrop-hover` class toggle, using the `.button()` property
31
- /// to determine the mis-fired event. This was determined experimentally -
32
- /// according to my read of the spec, this is a bug in Chrome.
33
- ///
34
- /// As a result there are 3 hover states `MouseEnter(true)`,
35
- /// `MouseEnter(false)`, and `MouseLeave`; `MouseEnter(false)` can be
36
- /// replaced, but it causes an extra render of the DOM un-necessarily.
27
+ /// The "New Column" row; hover is CSS so a drag's stray `mouseover` cannot
28
+ /// pin the highlight.
37
29
  #[function_component]
38
30
  pub fn AddExpressionButton(p: &AddExpressionButtonProps) -> Html {
39
- let is_mouseover = yew::use_state_eq(|| false);
40
- let onmouseover = yew::use_callback(is_mouseover.setter(), |event: MouseEvent, mo| {
41
- mo.set(event.button() == 0);
42
- });
31
+ let onmousedown = left_click(
32
+ p.on_open_expr_panel
33
+ .reform(|_| ColumnSettingsTarget::NewExpression),
34
+ );
43
35
 
44
- let onmouseout = yew::use_callback(is_mouseover.setter(), |_event, mo| {
45
- mo.set(false);
46
- });
47
-
48
- let onmousedown = p
49
- .on_open_expr_panel
50
- .reform(|_| ColumnSettingsTarget::NewExpression);
51
-
52
- let class = if *is_mouseover || matches!(p.selected_column, Some(ColumnLocator::NewExpression))
53
- {
36
+ let class = if matches!(p.selected_column, Some(ColumnLocator::NewExpression)) {
54
37
  classes!("dragdrop-hover")
55
38
  } else {
56
39
  classes!()
57
40
  };
58
41
 
59
42
  html! {
60
- <div id="add-expression" data-index="-1" {class} {onmouseover} {onmouseout} {onmousedown}>
43
+ <div id="add-expression" data-index="-1" {class} {onmousedown}>
61
44
  <span class="icon" />
62
45
  <span id="add-expression-button" />
63
46
  </div>
@@ -24,7 +24,8 @@ use crate::components::column_dropdown::{ColumnDropDownElement, ColumnDropDownPo
24
24
  use crate::components::dragdrop_list::*;
25
25
  use crate::components::filter_dropdown::{FilterDropDownElement, FilterDropDownPortal};
26
26
  use crate::config::PluginStaticConfig;
27
- use crate::presentation::Presentation;
27
+ use crate::presentation::{ColumnLocator, ColumnSettingsTarget, Presentation};
28
+ use crate::queries::has_column_config;
28
29
  use crate::renderer::*;
29
30
  use crate::session::drag_drop_update::*;
30
31
  use crate::session::*;
@@ -36,6 +37,13 @@ use crate::utils::*;
36
37
  pub struct ConfigSelectorProps {
37
38
  pub onselect: Callback<()>,
38
39
 
40
+ /// Opens a pivot column's settings, so its format config is reachable.
41
+ pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
42
+
43
+ /// The column whose settings sidebar is open, threaded as a VALUE prop so
44
+ /// closing or retargeting the sidebar clears this pill's open indicator.
45
+ pub selected_column: Option<ColumnLocator>,
46
+
39
47
  #[prop_or_default]
40
48
  pub ondragenter: Callback<()>,
41
49
 
@@ -43,9 +51,11 @@ pub struct ConfigSelectorProps {
43
51
  /// (group_by, sort, filter, etc.) trigger re-renders via normal prop
44
52
  /// diffing rather than a PubSub `view_created` subscription.
45
53
  pub view_config: PtrEqRc<ViewConfig>,
54
+
46
55
  /// Column currently being dragged — threaded to show `dragdrop-highlight`
47
56
  /// without subscribing to `dragstart_received`/`dragend_received`.
48
57
  pub drag_column: Option<String>,
58
+
49
59
  /// Session metadata snapshot — threaded from `SessionProps`.
50
60
  pub metadata: SessionMetadataRc,
51
61
 
@@ -69,6 +79,7 @@ pub struct ConfigSelectorProps {
69
79
  impl PartialEq for ConfigSelectorProps {
70
80
  fn eq(&self, other: &Self) -> bool {
71
81
  self.view_config == other.view_config
82
+ && self.selected_column == other.selected_column
72
83
  && self.drag_column == other.drag_column
73
84
  && self.metadata == other.metadata
74
85
  && self.selected_theme == other.selected_theme
@@ -241,7 +252,7 @@ impl Component for ConfigSelector {
241
252
  false
242
253
  },
243
254
  ConfigSelectorMsg::Close(index, DragTarget::Filter) => {
244
- self.filter_dropdown.hide().unwrap();
255
+ self.filter_dropdown.reset();
245
256
  let mut filter = ctx.props().view_config.filter.clone();
246
257
  filter.remove(index);
247
258
  let config = ViewConfigUpdate {
@@ -552,10 +563,10 @@ impl Component for ConfigSelector {
552
563
  }
553
564
  }
554
565
 
555
- // /// Should not render on change, as this component only depends on service
556
- // /// state.
557
- // fn changed(&mut self, _ctx: &Context<Self>, _old: &Self::Properties) -> bool
558
- // { false
566
+ // /// Should not render on change, as this component only depends on
567
+ // service /// state.
568
+ // fn changed(&mut self, _ctx: &Context<Self>, _old: &Self::Properties) ->
569
+ // bool { false
559
570
  // }
560
571
 
561
572
  fn view(&self, ctx: &Context<Self>) -> Html {
@@ -578,7 +589,18 @@ impl Component for ConfigSelector {
578
589
  )
579
590
  };
580
591
 
581
- let transpose = ctx.link().callback(|_| ConfigSelectorMsg::TransposePivots);
592
+ let has_config = |name: &str| {
593
+ has_column_config(name, config, &ctx.props().metadata, &ctx.props().renderer)
594
+ };
595
+
596
+ let editing_column = match &ctx.props().selected_column {
597
+ Some(ColumnLocator::Table(x))
598
+ | Some(ColumnLocator::Expression(x))
599
+ | Some(ColumnLocator::Window(x)) => Some(x.clone()),
600
+ _ => None,
601
+ };
602
+
603
+ let transpose = left_click(ctx.link().callback(|_| ConfigSelectorMsg::TransposePivots));
582
604
  let column_dropdown = self.column_dropdown.clone();
583
605
  let mut class = classes!();
584
606
 
@@ -665,6 +687,9 @@ impl Component for ConfigSelector {
665
687
  action={DragTarget::GroupBy}
666
688
  column={group_by.clone()}
667
689
  metadata={metadata.clone()}
690
+ on_open_expr_panel={has_config(group_by)
691
+ .then(|| ctx.props().on_open_expr_panel.clone())}
692
+ is_editing={editing_column.as_deref() == Some(group_by.as_str())}
668
693
  {presentation}
669
694
  opt_session={session}
670
695
  >
@@ -716,6 +741,9 @@ impl Component for ConfigSelector {
716
741
  action={ DragTarget::SplitBy }
717
742
  column={ split_by.clone() }
718
743
  metadata={metadata.clone()}
744
+ on_open_expr_panel={has_config(split_by)
745
+ .then(|| ctx.props().on_open_expr_panel.clone())}
746
+ is_editing={editing_column.as_deref() == Some(split_by.as_str())}
719
747
  {presentation}
720
748
  opt_session={session}>
721
749
  </PivotColumn>
@@ -0,0 +1,229 @@
1
+ // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
2
+ // ┃ ██████ ██████ ██████ █ █ █ █ █ █▄ ▀███ █ ┃
3
+ // ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█ ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄ ▀█ █ ▀▀▀▀▀ ┃
4
+ // ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄ █ ▄▄▄▄▄ ┃
5
+ // ┃ █ ██████ █ ▀█▄ █ ██████ █ ███▌▐███ ███████▄ █ ┃
6
+ // ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
7
+ // ┃ Copyright (c) 2017, the Perspective Authors. ┃
8
+ // ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
9
+ // ┃ This file is part of the Perspective library, distributed under the terms ┃
10
+ // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
11
+ // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
12
+
13
+ use perspective_client::config::ViewConfig;
14
+ use perspective_js::utils::ApiFuture;
15
+ use yew::prelude::*;
16
+
17
+ // use crate::derived::suggest_name;
18
+ use crate::presentation::Presentation;
19
+ // use crate::queries::fetch_hosted_tables;
20
+ use crate::renderer::Renderer;
21
+ use crate::session::{Session, SessionMetadataRc};
22
+ use crate::tasks::release_derived;
23
+ // use crate::tasks::{can_derive, create_derived, release_derived};
24
+ use crate::utils::{AddListener, PtrEqRc, Subscription, left_click, read_intl_string};
25
+ use crate::workspace::Workspace;
26
+
27
+ #[derive(Clone, Properties)]
28
+ pub struct DerivedControlProps {
29
+ pub session: Session,
30
+ pub renderer: Renderer,
31
+ pub presentation: Presentation,
32
+ pub workspace: Workspace,
33
+ pub metadata: SessionMetadataRc,
34
+ pub view_config: PtrEqRc<ViewConfig>,
35
+
36
+ /// The `Table` this panel is bound to, threaded as a value prop so the
37
+ /// chain re-renders when the binding changes.
38
+ pub table: Option<String>,
39
+ }
40
+
41
+ impl PartialEq for DerivedControlProps {
42
+ fn eq(&self, other: &Self) -> bool {
43
+ self.table == other.table
44
+ && self.metadata == other.metadata
45
+ && self.view_config == other.view_config
46
+ }
47
+ }
48
+
49
+ pub enum DerivedControlMsg {
50
+ // Create,
51
+ Release(bool),
52
+
53
+ /// Some panel's table binding changed — re-render so the consumer
54
+ /// count ([`Workspace::derived_consumers`]) gating refreshes.
55
+ Refresh,
56
+ }
57
+
58
+ pub struct DerivedControl {
59
+ /// Keeps the [`Workspace::bindings_changed`] listener attached for this
60
+ /// component's lifetime.
61
+ _bindings_sub: Subscription,
62
+ }
63
+
64
+ impl Component for DerivedControl {
65
+ type Message = DerivedControlMsg;
66
+ type Properties = DerivedControlProps;
67
+
68
+ fn create(ctx: &Context<Self>) -> Self {
69
+ let link = ctx.link().clone();
70
+ let _bindings_sub = ctx
71
+ .props()
72
+ .workspace
73
+ .bindings_changed()
74
+ .add_listener(move |_| link.send_message(DerivedControlMsg::Refresh));
75
+
76
+ Self { _bindings_sub }
77
+ }
78
+
79
+ fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
80
+ match msg {
81
+ // DerivedControlMsg::Create => {
82
+ // let props = ctx.props().clone();
83
+ // ApiFuture::spawn(async move {
84
+ // let name = suggest_name(
85
+ // &fetch_hosted_tables(&props.workspace)
86
+ // .await
87
+ // .into_iter()
88
+ // .flat_map(|(_, tables)| tables)
89
+ // .collect(),
90
+ // &props.view_config,
91
+ // &props.table,
92
+ // );
93
+
94
+ // create_derived(
95
+ // &props.session,
96
+ // &props.renderer,
97
+ // &props.presentation,
98
+ // &props.workspace,
99
+ // name,
100
+ // )
101
+ // .await
102
+ // });
103
+
104
+ // false
105
+ // },
106
+ DerivedControlMsg::Release(delete) => {
107
+ let props = ctx.props().clone();
108
+ let effect = props.workspace.effects().guard();
109
+ ApiFuture::spawn(async move {
110
+ let _effect = effect;
111
+ release_derived(
112
+ &props.session,
113
+ &props.renderer,
114
+ &props.presentation,
115
+ &props.workspace,
116
+ delete,
117
+ )
118
+ .await
119
+ });
120
+
121
+ false
122
+ },
123
+ DerivedControlMsg::Refresh => true,
124
+ }
125
+ }
126
+
127
+ fn view(&self, ctx: &Context<Self>) -> Html {
128
+ let props = ctx.props();
129
+ let workspace = &props.workspace;
130
+ let bound = props.table.clone().unwrap_or_default();
131
+ let is_derived = workspace.is_derived(&bound);
132
+ // let is_pivoted =
133
+ // !props.view_config.group_by.is_empty() ||
134
+ // !props.view_config.split_by.is_empty();
135
+
136
+ // let _can_create = is_pivoted && can_derive(&props.session);
137
+ // if !is_derived && !can_create {
138
+ // return html! {};
139
+ // }
140
+
141
+ if !is_derived {
142
+ return html! {};
143
+ }
144
+
145
+ let is_snapshot = !props.metadata.get_features().is_some_and(|x| x.on_update);
146
+ let mut chain = workspace.derived_ancestors(&bound);
147
+ chain.reverse();
148
+ if is_derived {
149
+ chain.push(bound.clone());
150
+ chain.remove(0);
151
+ }
152
+
153
+ let sole_consumer = workspace.derived_consumers(&bound) == 1;
154
+ let release = left_click(
155
+ ctx.link()
156
+ .callback(|event: MouseEvent| DerivedControlMsg::Release(event.shift_key())),
157
+ );
158
+
159
+ // let create = ctx.link().callback(|_| DerivedControlMsg::Create);
160
+ // let last = chain.len().saturating_sub(1);
161
+ let viewer = props.presentation.viewer_elem();
162
+ let intl = |slug: &str, fallback: &str| {
163
+ read_intl_string(viewer, slug).unwrap_or_else(|| fallback.to_owned())
164
+ };
165
+
166
+ // let _create_title = intl("derive-table-title", "Derive a new table
167
+ // from this view");
168
+ let snapshot_title = intl(
169
+ "derived-snapshot-title",
170
+ "This data source does not stream - this table's data is fixed at the point it was \
171
+ derived.",
172
+ );
173
+
174
+ let release_title = if sole_consumer {
175
+ intl(
176
+ "derived-release-delete-title",
177
+ "Back to the parent table - shift-click to delete this one",
178
+ )
179
+ } else {
180
+ intl("derived-release-title", "Back to the parent table")
181
+ };
182
+
183
+ let last = chain.len().saturating_sub(1);
184
+ let derived_tables = chain.iter().enumerate().map(|(idx, name)| {
185
+ let is_own = is_derived && idx == last;
186
+ // let consumers = workspace.derived_consumers(name);
187
+ let mut close_class = classes!("derived_release");
188
+ if sole_consumer {
189
+ close_class.push("shift-alt-icon");
190
+ }
191
+
192
+ let mut level_class = classes!("derived_level");
193
+ if is_own {
194
+ level_class.push("is-own");
195
+ }
196
+
197
+ html! {
198
+ <div class={level_class}>
199
+ <div class="derived_label_wrapper">
200
+ <span class="derived_icon" />
201
+ <span class="derived_label">{ name }</span>
202
+ </div>
203
+ // if consumers > 1 { <span class="derived_consumers">{ consumers }</span> }
204
+ if is_snapshot {
205
+ <span class="derived_snapshot" title={snapshot_title.clone()} />
206
+ }
207
+ if is_own {
208
+ <span
209
+ class={close_class}
210
+ title={release_title.clone()}
211
+ onmousedown={release.clone()}
212
+ />
213
+ } else {
214
+ <span class="derived_release disabled" />
215
+ }
216
+ </div>
217
+ }
218
+ });
219
+
220
+ html! {
221
+ <div id="derived_stack">
222
+ // if can_create {
223
+ // <div class="derived_create" title={create_title} onmousedown={create} />
224
+ // }
225
+ { for derived_tables }
226
+ </div>
227
+ }
228
+ }
229
+ }
@@ -13,6 +13,7 @@
13
13
  use yew::prelude::*;
14
14
 
15
15
  use super::ColumnSettingsTarget;
16
+ use crate::utils::left_click;
16
17
 
17
18
  #[derive(PartialEq, Clone, Properties)]
18
19
  pub struct ExprEditButtonProps {
@@ -41,10 +42,10 @@ pub struct ExprEditButtonProps {
41
42
  /// when pressed, it opens up the expression editor side-panel.
42
43
  #[function_component]
43
44
  pub fn ExprEditButton(p: &ExprEditButtonProps) -> Html {
44
- let onmousedown = yew::use_callback(p.clone(), |_, p| {
45
+ let onmousedown = left_click(yew::use_callback(p.clone(), |_, p| {
45
46
  p.on_open_expr_panel
46
47
  .emit(ColumnSettingsTarget::Column(p.name.clone()))
47
- });
48
+ }));
48
49
 
49
50
  let class = if p.is_disabled {
50
51
  "expression-edit-button disabled"
@@ -162,13 +162,13 @@ impl Component for FilterColumn {
162
162
  false
163
163
  },
164
164
  FilterColumnMsg::Close => {
165
- ctx.props().filter_dropdown.hide().unwrap();
165
+ ctx.props().filter_dropdown.reset();
166
166
  false
167
167
  },
168
168
  FilterColumnMsg::FilterKeyDown(13) => {
169
169
  if ctx.props().is_suggestable() {
170
170
  ctx.props().filter_dropdown.item_select();
171
- ctx.props().filter_dropdown.hide().unwrap();
171
+ ctx.props().filter_dropdown.dismiss();
172
172
  }
173
173
  false
174
174
  },
@@ -410,8 +410,6 @@ impl FilterColumnProps {
410
410
  self.metadata.get_column_table_type(filter.column())
411
411
  }
412
412
 
413
- // Get the string value, suitable for the `value` field of a `FilterColumns`'s
414
- // `<input>`.
415
413
  fn get_filter_input(&self) -> Option<String> {
416
414
  let filter_type = self.get_current_filter_type()?;
417
415
  match (&filter_type, &self.filter.term()) {
@@ -132,9 +132,10 @@ impl Component for InactiveColumn {
132
132
  .get_column_table_type(&ctx.props().name)
133
133
  .unwrap_or(ColumnType::String);
134
134
 
135
- let add_column = ctx
136
- .link()
137
- .callback(|event: MouseEvent| InactiveColumnMsg::ActivateColumn(event.shift_key()));
135
+ let add_column =
136
+ left_click(ctx.link().callback(|event: MouseEvent| {
137
+ InactiveColumnMsg::ActivateColumn(event.shift_key())
138
+ }));
138
139
 
139
140
  let ondragend = ctx.props().ondragend.reform(|_| {});
140
141
  let ondragstart = ctx.link().callback({
@@ -210,8 +211,6 @@ impl InactiveColumnProps {
210
211
  let mut columns = self.view_config.columns.clone();
211
212
  let max_cols = self.renderer.metadata().config_column_names.len();
212
213
 
213
- // Don't treat `None` at the end of the column list as columns, we'll refill
214
- // these later
215
214
  if let Some(last_filled) = columns.iter().rposition(|x| !x.is_none()) {
216
215
  columns.truncate(last_filled + 1);
217
216
 
@@ -14,9 +14,10 @@ use perspective_client::config::ColumnType;
14
14
  use web_sys::*;
15
15
  use yew::prelude::*;
16
16
 
17
+ use super::expr_edit_button::*;
17
18
  use crate::components::dragdrop_list::*;
18
19
  use crate::components::type_icon::TypeIcon;
19
- use crate::presentation::Presentation;
20
+ use crate::presentation::{ColumnSettingsTarget, Presentation};
20
21
  use crate::session::*;
21
22
  use crate::utils::*;
22
23
 
@@ -35,6 +36,14 @@ pub struct PivotColumnProps {
35
36
  #[prop_or_default]
36
37
  pub metadata: Option<SessionMetadataRc>,
37
38
 
39
+ /// Opens this column's settings, when the host offers them.
40
+ #[prop_or_default]
41
+ pub on_open_expr_panel: Option<Callback<ColumnSettingsTarget>>,
42
+
43
+ /// Is this column's settings panel open?
44
+ #[prop_or_default]
45
+ pub is_editing: bool,
46
+
38
47
  // State
39
48
  #[prop_or_default]
40
49
  pub opt_session: Option<Session>,
@@ -46,6 +55,8 @@ impl PartialEq for PivotColumnProps {
46
55
  self.column == other.column
47
56
  && self.action == other.action
48
57
  && self.metadata == other.metadata
58
+ && self.is_editing == other.is_editing
59
+ && self.on_open_expr_panel.is_some() == other.on_open_expr_panel.is_some()
49
60
  }
50
61
  }
51
62
 
@@ -103,6 +114,15 @@ impl Component for PivotColumn {
103
114
  <span class="drag-handle icon" />
104
115
  <TypeIcon ty={col_type} />
105
116
  <span class="column_name">{ ctx.props().column.clone() }</span>
117
+ if let Some(on_open_expr_panel) = &ctx.props().on_open_expr_panel {
118
+ <ExprEditButton
119
+ name={ctx.props().column.clone()}
120
+ {on_open_expr_panel}
121
+ is_expression=false
122
+ is_disabled=false
123
+ is_editing={ctx.props().is_editing}
124
+ />
125
+ }
106
126
  </div>
107
127
  </div>
108
128
  }
@@ -96,9 +96,10 @@ impl Component for SortColumn {
96
96
  }
97
97
 
98
98
  fn view(&self, ctx: &Context<Self>) -> Html {
99
- let onclick = ctx
100
- .link()
101
- .callback(|event: MouseEvent| SortColumnMsg::SortDirClick(event.shift_key()));
99
+ let onclick = left_click(
100
+ ctx.link()
101
+ .callback(|event: MouseEvent| SortColumnMsg::SortDirClick(event.shift_key())),
102
+ );
102
103
 
103
104
  let dragstart = Callback::from({
104
105
  let event_name = ctx.props().sort.0.to_owned();
@@ -15,6 +15,7 @@ mod add_expression_button;
15
15
  mod aggregate_selector;
16
16
  mod column_selector_column_row;
17
17
  mod config_selector;
18
+ mod derived_control;
18
19
  mod empty_column;
19
20
  mod expr_edit_button;
20
21
  mod filter_column;
@@ -37,6 +38,7 @@ use yew::prelude::*;
37
38
  use self::active_column::*;
38
39
  use self::add_expression_button::AddExpressionButton;
39
40
  use self::config_selector::ConfigSelector;
41
+ use self::derived_control::DerivedControl;
40
42
  use self::inactive_column::*;
41
43
  use crate::components::column_dropdown::{ColumnDropDownElement, ColumnDropDownPortal};
42
44
  use crate::config::PluginStaticConfig;
@@ -50,6 +52,7 @@ use crate::session::*;
50
52
  use crate::tasks::apply_and_render;
51
53
  use crate::ui::{Orientation, ScrollPanel, ScrollPanelItem, SplitPanel};
52
54
  use crate::utils::*;
55
+ use crate::workspace::Workspace;
53
56
 
54
57
  #[derive(Properties)]
55
58
  pub struct ColumnSelectorProps {
@@ -83,6 +86,7 @@ pub struct ColumnSelectorProps {
83
86
  // State
84
87
  pub session: Session,
85
88
  pub renderer: Renderer,
89
+ pub workspace: Workspace,
86
90
  pub presentation: Presentation,
87
91
 
88
92
  /// Fires when this component is resized via the UI.
@@ -391,10 +395,26 @@ impl Component for ColumnSelector {
391
395
  .unwrap_or_default(),
392
396
  );
393
397
 
398
+ let derived_control = html_nested! {
399
+ <ScrollPanelItem key="derived_control" size_hint=0_f64>
400
+ <DerivedControl
401
+ session={ctx.props().session.clone()}
402
+ renderer={ctx.props().renderer.clone()}
403
+ presentation={ctx.props().presentation.clone()}
404
+ workspace={ctx.props().workspace.clone()}
405
+ metadata={ctx.props().metadata.clone()}
406
+ view_config={ctx.props().view_config.clone()}
407
+ table={ctx.props().session.get_table().map(|x| x.get_name().to_owned())}
408
+ />
409
+ </ScrollPanelItem>
410
+ };
411
+
394
412
  let config_selector = html_nested! {
395
413
  <ScrollPanelItem key="config_selector" {size_hint}>
396
414
  <ConfigSelector
397
415
  onselect={onselect.clone()}
416
+ on_open_expr_panel={ctx.props().on_open_expr_panel.clone()}
417
+ selected_column={ctx.props().selected_column.clone()}
398
418
  ondragenter={ctx.link().callback(|()| Redraw)}
399
419
  view_config={ctx.props().view_config.clone()}
400
420
  drag_column={ctx.props().drag_column.clone()}
@@ -570,7 +590,7 @@ impl Component for ColumnSelector {
570
590
  drop={ondrop}
571
591
  on_resize={&ctx.props().on_resize}
572
592
  on_dimensions_reset={&self.on_reset}
573
- children={std::iter::once(config_selector).chain(active_columns).collect::<Vec<_>>()}
593
+ children={std::iter::once(derived_control).chain(std::iter::once(config_selector)).chain(active_columns).collect::<Vec<_>>()}
574
594
  />
575
595
  </div>
576
596
  }];
@@ -12,6 +12,8 @@
12
12
 
13
13
  use yew::{Callback, Html, Properties, function_component, html};
14
14
 
15
+ use crate::utils::left_click;
16
+
15
17
  #[derive(Properties, PartialEq, Clone)]
16
18
  pub struct SaveSettingsProps {
17
19
  pub save_enabled: bool,
@@ -26,9 +28,9 @@ pub struct SaveSettingsProps {
26
28
 
27
29
  #[function_component(SaveSettings)]
28
30
  pub fn save_settings(props: &SaveSettingsProps) -> Html {
29
- let reset = props.on_reset.reform(|_| ());
30
- let save = props.on_save.reform(|_| ());
31
- let delete = props.on_delete.reform(|_| ());
31
+ let reset = left_click(props.on_reset.reform(|_| ()));
32
+ let save = left_click(props.on_save.reform(|_| ()));
33
+ let delete = left_click(props.on_delete.reform(|_| ()));
32
34
  html! {
33
35
  <div id="save-settings-wrapper">
34
36
  if props.show_danger_zone {