@perspective-dev/viewer 5.6.0 → 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.
- package/dist/cdn/perspective-viewer.js +9 -9
- package/dist/cdn/perspective-viewer.js.map +4 -4
- package/dist/css/blueprint.css +1 -1
- package/dist/css/botanical.css +1 -1
- package/dist/css/dracula.css +1 -1
- package/dist/css/eggplant.css +1 -1
- package/dist/css/gruvbox-dark.css +1 -1
- package/dist/css/gruvbox.css +1 -1
- package/dist/css/intl/ar.css +1 -1
- package/dist/css/intl/de.css +1 -1
- package/dist/css/intl/es.css +1 -1
- package/dist/css/intl/fr.css +1 -1
- package/dist/css/intl/ja.css +1 -1
- package/dist/css/intl/pt.css +1 -1
- package/dist/css/intl/zh.css +1 -1
- package/dist/css/intl.css +1 -1
- package/dist/css/ledger.css +1 -1
- package/dist/css/monokai.css +1 -1
- package/dist/css/nord.css +1 -1
- package/dist/css/phosphor.css +1 -1
- package/dist/css/pro-dark.css +1 -1
- package/dist/css/pro.css +1 -1
- package/dist/css/solarized-dark.css +1 -1
- package/dist/css/solarized.css +1 -1
- package/dist/css/themes.css +1 -1
- package/dist/css/vaporwave.css +1 -1
- package/dist/css/velvet.css +1 -1
- package/dist/docs/perspective-docs.json +1 -1
- package/dist/esm/perspective-viewer.js +9 -9
- package/dist/esm/perspective-viewer.js.map +4 -4
- package/dist/esm/ts-rs/Layout.d.ts +2 -2
- package/dist/esm/ts-rs/Orientation.d.ts +2 -1
- package/dist/esm/ts-rs/SplitLayout.d.ts +13 -0
- package/dist/esm/ts-rs/TabLayout.d.ts +3 -0
- package/dist/esm/ts-rs/WorkspaceConfigUpdate.d.ts +2 -1
- package/dist/wasm/perspective-viewer.d.ts +16 -16
- package/dist/wasm/perspective-viewer.js +111 -111
- package/dist/wasm/perspective-viewer.wasm +0 -0
- package/dist/wasm/perspective-viewer.wasm.d.ts +16 -16
- package/package.json +7 -7
- package/src/rust/agent/preamble.md +2 -0
- package/src/rust/agent/tools.rs +280 -1
- package/src/rust/components/column_selector/config_selector.rs +1 -1
- package/src/rust/components/column_selector/filter_column.rs +2 -2
- package/src/rust/components/column_settings_sidebar/style_tab/symbol/row_selector.rs +1 -1
- package/src/rust/components/empty_row.rs +3 -3
- package/src/rust/components/filter_dropdown.rs +100 -101
- package/src/rust/components/main_panel/reconcile.rs +65 -28
- package/src/rust/components/main_panel/update.rs +8 -47
- package/src/rust/components/main_panel.rs +5 -16
- package/src/rust/config/workspace_config.rs +2 -1
- package/src/rust/js/regular_layout.rs +225 -3
- package/src/rust/tasks/sync_update_panels.rs +10 -19
- package/src/themes/intl/ar.css +1 -0
- package/src/themes/intl/de.css +1 -0
- package/src/themes/intl/es.css +1 -0
- package/src/themes/intl/fr.css +1 -0
- package/src/themes/intl/ja.css +1 -0
- package/src/themes/intl/pt.css +1 -0
- package/src/themes/intl/zh.css +1 -0
- package/src/themes/intl.css +1 -0
- package/src/ts/ts-rs/Layout.ts +2 -2
- package/src/ts/ts-rs/Orientation.ts +2 -1
- package/src/ts/ts-rs/SplitLayout.ts +17 -1
- package/src/ts/ts-rs/TabLayout.ts +3 -0
- package/src/ts/ts-rs/WorkspaceConfigUpdate.ts +2 -1
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline0.js +0 -0
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline1.js +0 -0
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline2.js +0 -0
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline3.js +0 -0
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline4.js +0 -0
- /package/dist/wasm/snippets/{perspective-viewer-d0d525977a1acba2 → perspective-viewer-7fc45549159e01e4}/inline5.js +0 -0
|
@@ -14,7 +14,6 @@ use std::cell::RefCell;
|
|
|
14
14
|
use std::collections::HashSet;
|
|
15
15
|
use std::rc::Rc;
|
|
16
16
|
|
|
17
|
-
use perspective_client::clone;
|
|
18
17
|
use web_sys::*;
|
|
19
18
|
use yew::html::ImplicitClone;
|
|
20
19
|
use yew::prelude::*;
|
|
@@ -25,12 +24,19 @@ use crate::ui::PortalModal;
|
|
|
25
24
|
use crate::utils::*;
|
|
26
25
|
use crate::*;
|
|
27
26
|
|
|
28
|
-
|
|
29
|
-
struct
|
|
27
|
+
/// The suggestion list while it is on screen, the only state a key may act on.
|
|
28
|
+
struct OpenState {
|
|
30
29
|
values: Vec<String>,
|
|
31
30
|
selected: usize,
|
|
32
|
-
on_select:
|
|
33
|
-
target:
|
|
31
|
+
on_select: Callback<String>,
|
|
32
|
+
target: HtmlElement,
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
#[derive(Default)]
|
|
36
|
+
enum FilterDropDownState {
|
|
37
|
+
#[default]
|
|
38
|
+
Hidden,
|
|
39
|
+
Open(OpenState),
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
#[derive(Clone)]
|
|
@@ -62,7 +68,6 @@ impl FilterDropDownElement {
|
|
|
62
68
|
}
|
|
63
69
|
|
|
64
70
|
pub fn reautocomplete(&self) {
|
|
65
|
-
// Re-open portal with current target
|
|
66
71
|
self.notify.emit(());
|
|
67
72
|
}
|
|
68
73
|
|
|
@@ -78,97 +83,94 @@ impl FilterDropDownElement {
|
|
|
78
83
|
match current_column {
|
|
79
84
|
Some(filter_col) if filter_col == column => {
|
|
80
85
|
let values = filter_values(&input, &self.all_values, &exclude);
|
|
81
|
-
|
|
82
|
-
let _ = self.hide();
|
|
83
|
-
} else {
|
|
84
|
-
let mut s = self.state.borrow_mut();
|
|
85
|
-
s.values = values;
|
|
86
|
-
s.selected = 0;
|
|
87
|
-
s.on_select = Some(callback);
|
|
88
|
-
if s.target.is_none() {
|
|
89
|
-
s.target = Some(target);
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
drop(s);
|
|
93
|
-
self.notify.emit(());
|
|
94
|
-
}
|
|
86
|
+
self.show(values, &input, target, callback);
|
|
95
87
|
},
|
|
96
88
|
_ => {
|
|
97
|
-
clone
|
|
98
|
-
self.state,
|
|
99
|
-
self.session,
|
|
100
|
-
self.all_values,
|
|
101
|
-
self.notify,
|
|
102
|
-
old_column = self.column
|
|
103
|
-
);
|
|
89
|
+
let this = self.clone();
|
|
104
90
|
ApiFuture::spawn(async move {
|
|
105
91
|
let fetched =
|
|
106
|
-
crate::queries::get_column_values(&session, column.1.clone()).await?;
|
|
107
|
-
*all_values.borrow_mut() = Some(fetched);
|
|
108
|
-
|
|
109
|
-
let
|
|
110
|
-
|
|
111
|
-
*old_column.borrow_mut() = Some(column);
|
|
112
|
-
{
|
|
113
|
-
let mut s = state.borrow_mut();
|
|
114
|
-
s.on_select = Some(callback);
|
|
115
|
-
if should_hide {
|
|
116
|
-
let fv = self::filter_values("", &all_values, &exclude);
|
|
117
|
-
s.values = fv;
|
|
118
|
-
s.target = Some(target);
|
|
119
|
-
} else {
|
|
120
|
-
s.values = values;
|
|
121
|
-
s.target = Some(target);
|
|
122
|
-
}
|
|
123
|
-
s.selected = 0;
|
|
124
|
-
}
|
|
125
|
-
if should_hide {
|
|
126
|
-
state.borrow_mut().target = None;
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
notify.emit(());
|
|
92
|
+
crate::queries::get_column_values(&this.session, column.1.clone()).await?;
|
|
93
|
+
*this.all_values.borrow_mut() = Some(fetched);
|
|
94
|
+
*this.column.borrow_mut() = Some(column);
|
|
95
|
+
let values = filter_values(&input, &this.all_values, &exclude);
|
|
96
|
+
this.show(values, &input, target, callback);
|
|
130
97
|
Ok(())
|
|
131
98
|
});
|
|
132
99
|
},
|
|
133
100
|
}
|
|
134
101
|
}
|
|
135
102
|
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
103
|
+
/// Open the list, or dismiss it when `input` is its one exact match.
|
|
104
|
+
fn show(
|
|
105
|
+
&self,
|
|
106
|
+
values: Vec<String>,
|
|
107
|
+
input: &str,
|
|
108
|
+
target: HtmlElement,
|
|
109
|
+
on_select: Callback<String>,
|
|
110
|
+
) {
|
|
111
|
+
if values.len() == 1 && values[0] == input {
|
|
112
|
+
self.dismiss();
|
|
113
|
+
} else {
|
|
114
|
+
*self.state.borrow_mut() = FilterDropDownState::Open(OpenState {
|
|
115
|
+
values,
|
|
116
|
+
selected: 0,
|
|
117
|
+
on_select,
|
|
118
|
+
target,
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
self.notify.emit(());
|
|
142
122
|
}
|
|
143
123
|
}
|
|
144
124
|
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
state.
|
|
148
|
-
|
|
149
|
-
|
|
125
|
+
/// Accept a visible list's highlighted suggestion; a hidden list has none.
|
|
126
|
+
pub fn item_select(&self) {
|
|
127
|
+
let selected = match &*self.state.borrow() {
|
|
128
|
+
FilterDropDownState::Open(open) => open
|
|
129
|
+
.values
|
|
130
|
+
.get(open.selected)
|
|
131
|
+
.map(|value| (value.clone(), open.on_select.clone())),
|
|
132
|
+
FilterDropDownState::Hidden => None,
|
|
133
|
+
};
|
|
134
|
+
|
|
135
|
+
if let Some((value, on_select)) = selected {
|
|
136
|
+
on_select.emit(value);
|
|
150
137
|
}
|
|
138
|
+
}
|
|
151
139
|
|
|
152
|
-
|
|
153
|
-
self.
|
|
140
|
+
pub fn item_down(&self) {
|
|
141
|
+
self.step(1);
|
|
154
142
|
}
|
|
155
143
|
|
|
156
144
|
pub fn item_up(&self) {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
145
|
+
self.step(-1);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
fn step(&self, delta: isize) {
|
|
149
|
+
let moved = match &mut *self.state.borrow_mut() {
|
|
150
|
+
FilterDropDownState::Open(open) if !open.values.is_empty() => {
|
|
151
|
+
let len = open.values.len() as isize;
|
|
152
|
+
open.selected = (open.selected as isize + delta).rem_euclid(len) as usize;
|
|
153
|
+
true
|
|
154
|
+
},
|
|
155
|
+
_ => false,
|
|
156
|
+
};
|
|
157
|
+
|
|
158
|
+
if moved {
|
|
159
|
+
self.notify.emit(());
|
|
160
160
|
}
|
|
161
|
+
}
|
|
161
162
|
|
|
162
|
-
|
|
163
|
-
|
|
163
|
+
/// Close the list, keeping the column's values for the next keystroke.
|
|
164
|
+
pub fn dismiss(&self) {
|
|
165
|
+
*self.state.borrow_mut() = FilterDropDownState::Hidden;
|
|
164
166
|
self.notify.emit(());
|
|
165
167
|
}
|
|
166
168
|
|
|
167
|
-
|
|
168
|
-
|
|
169
|
+
/// Close the list and forget the column so the next focus refetches it.
|
|
170
|
+
pub fn reset(&self) {
|
|
169
171
|
self.column.borrow_mut().take();
|
|
170
|
-
self.
|
|
171
|
-
|
|
172
|
+
self.all_values.borrow_mut().take();
|
|
173
|
+
self.dismiss();
|
|
172
174
|
}
|
|
173
175
|
}
|
|
174
176
|
|
|
@@ -201,35 +203,32 @@ impl Component for FilterDropDownPortal {
|
|
|
201
203
|
}
|
|
202
204
|
|
|
203
205
|
fn view(&self, ctx: &Context<Self>) -> Html {
|
|
204
|
-
let
|
|
205
|
-
let
|
|
206
|
+
let element = &ctx.props().element;
|
|
207
|
+
let state = element.state.borrow();
|
|
208
|
+
let FilterDropDownState::Open(open) = &*state else {
|
|
209
|
+
return html! {};
|
|
210
|
+
};
|
|
211
|
+
|
|
206
212
|
let on_close = {
|
|
207
|
-
let element =
|
|
208
|
-
Callback::from(move |()|
|
|
209
|
-
let _ = element.hide();
|
|
210
|
-
})
|
|
213
|
+
let element = element.clone();
|
|
214
|
+
Callback::from(move |()| element.dismiss())
|
|
211
215
|
};
|
|
212
216
|
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
{
|
|
224
|
-
|
|
225
|
-
{
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
<FilterDropDownView {values} {selected} {on_select} />
|
|
229
|
-
</PortalModal>
|
|
230
|
-
}
|
|
231
|
-
} else {
|
|
232
|
-
html! {}
|
|
217
|
+
html! {
|
|
218
|
+
<PortalModal
|
|
219
|
+
tag_name="perspective-dropdown"
|
|
220
|
+
sheet={StyleSurface::FilterDropdown.sheet()}
|
|
221
|
+
target={Some(open.target.clone())}
|
|
222
|
+
own_focus=false
|
|
223
|
+
{on_close}
|
|
224
|
+
theme={ctx.props().theme.clone()}
|
|
225
|
+
>
|
|
226
|
+
<FilterDropDownView
|
|
227
|
+
values={open.values.clone()}
|
|
228
|
+
selected={open.selected}
|
|
229
|
+
on_select={open.on_select.clone()}
|
|
230
|
+
/>
|
|
231
|
+
</PortalModal>
|
|
233
232
|
}
|
|
234
233
|
}
|
|
235
234
|
}
|
|
@@ -238,7 +237,7 @@ impl Component for FilterDropDownPortal {
|
|
|
238
237
|
struct FilterDropDownViewProps {
|
|
239
238
|
values: Vec<String>,
|
|
240
239
|
selected: usize,
|
|
241
|
-
on_select:
|
|
240
|
+
on_select: Callback<String>,
|
|
242
241
|
}
|
|
243
242
|
|
|
244
243
|
#[function_component]
|
|
@@ -249,7 +248,7 @@ fn FilterDropDownView(props: &FilterDropDownViewProps) -> Html {
|
|
|
249
248
|
.iter()
|
|
250
249
|
.enumerate()
|
|
251
250
|
.map(|(idx, value)| {
|
|
252
|
-
let click = props.on_select.
|
|
251
|
+
let click = props.on_select.reform({
|
|
253
252
|
let value = value.clone();
|
|
254
253
|
move |_: MouseEvent| value.clone()
|
|
255
254
|
});
|
|
@@ -21,7 +21,8 @@ use wasm_bindgen::prelude::*;
|
|
|
21
21
|
use yew::prelude::*;
|
|
22
22
|
|
|
23
23
|
use super::MainPanel;
|
|
24
|
-
use crate::js::RegularLayout;
|
|
24
|
+
use crate::js::{Layout, Orientation, RegularLayout};
|
|
25
|
+
use crate::workspace::PanelId;
|
|
25
26
|
|
|
26
27
|
/// Layout interaction tuning constants, applied via
|
|
27
28
|
/// [`RegularLayout::restore_physics`] when the layout element mounts.
|
|
@@ -40,18 +41,10 @@ const LAYOUT_PHYSICS: LayoutPhysics = LayoutPhysics {
|
|
|
40
41
|
};
|
|
41
42
|
|
|
42
43
|
impl MainPanel {
|
|
43
|
-
/// Size each STAGED panel's hidden
|
|
44
|
-
///
|
|
45
|
-
///
|
|
46
|
-
|
|
47
|
-
/// redistribution) minus the frame-chrome fallback the presize sweep
|
|
48
|
-
/// uses. Prediction only — the staged first draw renders at these
|
|
49
|
-
/// dimensions, and any delta from the real committed cell is
|
|
50
|
-
/// reconciled by the post-commit reactive resize (free when exact,
|
|
51
|
-
/// via the charts transport's dims-unchanged guard). Imperative
|
|
52
|
-
/// because it MEASURES the committed layout box, which a `view()`
|
|
53
|
-
/// style prop cannot.
|
|
54
|
-
pub(super) fn size_staging_wrappers(&self) {
|
|
44
|
+
/// Size each STAGED panel's hidden `.psp-staging` wrapper to the exact
|
|
45
|
+
/// plugin box its promote insert will commit (see
|
|
46
|
+
/// `.plan/DUPLICATE_STAGING_PREDICTION_PLAN.md`).
|
|
47
|
+
pub(super) fn size_staging_wrappers(&self, ctx: &Context<Self>) {
|
|
55
48
|
let Some(root) = self.main_panel_ref.cast::<web_sys::Element>() else {
|
|
56
49
|
return;
|
|
57
50
|
};
|
|
@@ -64,23 +57,70 @@ impl MainPanel {
|
|
|
64
57
|
return;
|
|
65
58
|
}
|
|
66
59
|
|
|
67
|
-
let Some(
|
|
60
|
+
let Some(el) = self.layout_ref.cast::<web_sys::HtmlElement>() else {
|
|
68
61
|
return;
|
|
69
62
|
};
|
|
70
63
|
|
|
71
|
-
let
|
|
72
|
-
let
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
64
|
+
let layout: &RegularLayout = el.unchecked_ref();
|
|
65
|
+
let Ok(mut tree) = layout.save().into_serde_ext::<Layout>() else {
|
|
66
|
+
return;
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
let (chrome_w, chrome_h) = self
|
|
70
|
+
.placed_chrome(ctx, layout)
|
|
71
|
+
.unwrap_or(crate::tasks::CHROME_FALLBACK);
|
|
72
|
+
|
|
73
|
+
let mut index = self.inserted.len();
|
|
76
74
|
for i in 0..wrappers.length() {
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
let Some(wrapper) = wrappers
|
|
76
|
+
.get(i)
|
|
77
|
+
.and_then(|node| node.dyn_into::<web_sys::HtmlElement>().ok())
|
|
78
|
+
else {
|
|
79
|
+
continue;
|
|
80
|
+
};
|
|
81
|
+
|
|
82
|
+
let Some(name) = wrapper.get_attribute("data-panel") else {
|
|
83
|
+
continue;
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
tree = tree.insert_split(index, &name, Orientation::Horizontal);
|
|
87
|
+
index += 1;
|
|
88
|
+
let Some(window) = tree
|
|
89
|
+
.view_window(&name)
|
|
90
|
+
.and_then(|window| JsValue::from_serde_ext(&window).ok())
|
|
91
|
+
else {
|
|
92
|
+
continue;
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
let cell: web_sys::DomRect = layout.real_coordinates(&window).unchecked_into();
|
|
96
|
+
let width = (cell.width() - chrome_w).max(0.0);
|
|
97
|
+
let height = (cell.height() - chrome_h).max(0.0);
|
|
98
|
+
let _ = wrapper.style().set_property("width", &format!("{width}px"));
|
|
99
|
+
let _ = wrapper
|
|
100
|
+
.style()
|
|
101
|
+
.set_property("height", &format!("{height}px"));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/// The frame chrome around a placed, visible plugin, measured from the
|
|
106
|
+
/// first such panel.
|
|
107
|
+
fn placed_chrome(&self, ctx: &Context<Self>, layout: &RegularLayout) -> Option<(f64, f64)> {
|
|
108
|
+
let layout_el: &web_sys::Element = layout.unchecked_ref();
|
|
109
|
+
self.inserted.iter().find_map(|name| {
|
|
110
|
+
let panel = ctx.props().workspace.panel(&PanelId::from(name.as_str()))?;
|
|
111
|
+
if !panel.renderer.is_plugin_activated().unwrap_or(false)
|
|
112
|
+
|| panel.renderer.is_plugin_hidden()
|
|
79
113
|
{
|
|
80
|
-
|
|
81
|
-
let _ = el.style().set_property("height", &format!("{height}px"));
|
|
114
|
+
return None;
|
|
82
115
|
}
|
|
83
|
-
|
|
116
|
+
|
|
117
|
+
let plugin = panel.renderer.active_plugin()?;
|
|
118
|
+
let frame = layout_el
|
|
119
|
+
.query_selector(&format!("regular-layout-frame[name=\"{name}\"]"))
|
|
120
|
+
.ok()??;
|
|
121
|
+
|
|
122
|
+
crate::tasks::plugin_chrome(&frame, plugin.unchecked_ref())
|
|
123
|
+
})
|
|
84
124
|
}
|
|
85
125
|
|
|
86
126
|
/// Reconcile the `<regular-layout>` grid against `panel_ids`: `insertPanel`
|
|
@@ -111,8 +151,7 @@ impl MainPanel {
|
|
|
111
151
|
if self.listener_target.as_ref() != Some(&el) {
|
|
112
152
|
if self.listener_target.is_some() {
|
|
113
153
|
self.inserted.clear();
|
|
114
|
-
self.
|
|
115
|
-
self.suspect_closes.clear();
|
|
154
|
+
self.on_screen.clear();
|
|
116
155
|
}
|
|
117
156
|
|
|
118
157
|
let _ = el.add_event_listener_with_callback(
|
|
@@ -191,7 +230,6 @@ impl MainPanel {
|
|
|
191
230
|
let path = JsValue::from(js_sys::Array::of1(&JsValue::from_f64(index as f64)));
|
|
192
231
|
let _ = layout.insert_panel(name, path, JsValue::from_bool(true));
|
|
193
232
|
self.inserted.push(name.to_owned());
|
|
194
|
-
self.pending_insertions.insert(name.to_owned());
|
|
195
233
|
}
|
|
196
234
|
|
|
197
235
|
let mut pending = std::mem::take(&mut self.pending_removals);
|
|
@@ -201,7 +239,6 @@ impl MainPanel {
|
|
|
201
239
|
}
|
|
202
240
|
|
|
203
241
|
if pending.insert(name.clone()) {
|
|
204
|
-
self.pending_insertions.remove(name);
|
|
205
242
|
let _ = layout.remove_panel(name);
|
|
206
243
|
}
|
|
207
244
|
|
|
@@ -19,8 +19,7 @@ use perspective_js::utils::JsValueSerdeExt;
|
|
|
19
19
|
use wasm_bindgen::prelude::*;
|
|
20
20
|
use yew::prelude::*;
|
|
21
21
|
|
|
22
|
-
use super::
|
|
23
|
-
use crate::ApiFuture;
|
|
22
|
+
use super::MainPanel;
|
|
24
23
|
use crate::components::panel_menu::PanelCommand;
|
|
25
24
|
use crate::js::{Layout, RegularLayout};
|
|
26
25
|
use crate::renderer::SUBPIXEL_EPSILON;
|
|
@@ -59,48 +58,27 @@ impl MainPanel {
|
|
|
59
58
|
|
|
60
59
|
let layout: RegularLayout = el.unchecked_into();
|
|
61
60
|
let mut closed = Vec::new();
|
|
62
|
-
let
|
|
63
|
-
let mut suspect_closes = std::mem::take(&mut self.suspect_closes);
|
|
61
|
+
let on_screen = &mut self.on_screen;
|
|
64
62
|
self.inserted.retain(|id| {
|
|
65
63
|
if layout.contains_panel(id) {
|
|
66
|
-
|
|
67
|
-
suspect_closes.remove(id);
|
|
64
|
+
on_screen.insert(id.clone());
|
|
68
65
|
true
|
|
69
|
-
} else if
|
|
70
|
-
|
|
71
|
-
// the pre-commit window, not a close.
|
|
72
|
-
true
|
|
73
|
-
} else if ctx.props().panel_ids.iter().any(|p| p.as_str() == id)
|
|
74
|
-
&& suspect_closes.insert(id.clone())
|
|
66
|
+
} else if on_screen.remove(id)
|
|
67
|
+
|| !ctx.props().panel_ids.iter().any(|p| p.as_str() == id)
|
|
75
68
|
{
|
|
76
|
-
true
|
|
77
|
-
} else {
|
|
78
|
-
suspect_closes.remove(id);
|
|
79
69
|
closed.push(id.clone());
|
|
80
70
|
false
|
|
71
|
+
} else {
|
|
72
|
+
true
|
|
81
73
|
}
|
|
82
74
|
});
|
|
83
75
|
|
|
84
|
-
self.pending_insertions = pending_insertions;
|
|
85
|
-
let recheck = !suspect_closes.is_empty();
|
|
86
|
-
self.suspect_closes = suspect_closes;
|
|
87
|
-
if recheck {
|
|
88
|
-
let link = ctx.link().clone();
|
|
89
|
-
ApiFuture::spawn(async move {
|
|
90
|
-
crate::utils::request_animation_frame().await;
|
|
91
|
-
link.send_message(MainPanelMsg::LayoutUpdated);
|
|
92
|
-
Ok(())
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
|
|
96
76
|
let closed_any = !closed.is_empty();
|
|
97
77
|
for id in closed {
|
|
98
78
|
self.pending_removals.remove(&id);
|
|
99
79
|
ctx.props().on_panel_closed.emit(id);
|
|
100
80
|
}
|
|
101
81
|
|
|
102
|
-
let reissue = self.forget_dropped_removals(&layout);
|
|
103
|
-
|
|
104
82
|
// A layout change (divider drag, insert, restore) reflows the
|
|
105
83
|
// grid cells without resizing the host, so the host
|
|
106
84
|
// `ResizeObserver` never fires. Resize every activated panel's
|
|
@@ -153,25 +131,8 @@ impl MainPanel {
|
|
|
153
131
|
self.hidden_tabs = hidden;
|
|
154
132
|
true
|
|
155
133
|
} else {
|
|
156
|
-
closed_any
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
/// Forget every issued removal whose panel survived the commit, so the
|
|
161
|
-
/// next `reconcile` re-issues it.
|
|
162
|
-
fn forget_dropped_removals(&mut self, layout: &RegularLayout) -> bool {
|
|
163
|
-
let dropped = self
|
|
164
|
-
.pending_removals
|
|
165
|
-
.iter()
|
|
166
|
-
.filter(|id| layout.contains_panel(id))
|
|
167
|
-
.cloned()
|
|
168
|
-
.collect::<Vec<_>>();
|
|
169
|
-
let reissue = !dropped.is_empty();
|
|
170
|
-
for id in dropped {
|
|
171
|
-
self.pending_removals.remove(&id);
|
|
134
|
+
closed_any
|
|
172
135
|
}
|
|
173
|
-
|
|
174
|
-
reissue
|
|
175
136
|
}
|
|
176
137
|
|
|
177
138
|
pub(super) fn on_tab_selected(&self, ctx: &Context<Self>, name: String) -> bool {
|
|
@@ -212,19 +212,9 @@ pub struct MainPanel {
|
|
|
212
212
|
/// layout and not yet committed.
|
|
213
213
|
pending_removals: HashSet<String>,
|
|
214
214
|
|
|
215
|
-
/// Ids
|
|
216
|
-
///
|
|
217
|
-
|
|
218
|
-
/// commits, and close detection must not mistake the pre-commit window
|
|
219
|
-
/// for a user close (it once disposed the second of two restored
|
|
220
|
-
/// panels mid-restore).
|
|
221
|
-
pending_insertions: HashSet<String>,
|
|
222
|
-
|
|
223
|
-
/// MODEL-held panels observed absent from exactly one committed tree,
|
|
224
|
-
/// awaiting the next `regular-layout-update` (rescheduled one frame out)
|
|
225
|
-
/// to confirm a layout-originated close — an unrelated removal's commit
|
|
226
|
-
/// can report a live sibling absent transiently.
|
|
227
|
-
suspect_closes: HashSet<String>,
|
|
215
|
+
/// Ids observed in a committed layout tree, the only model-held panels a
|
|
216
|
+
/// later commit can report closed.
|
|
217
|
+
on_screen: HashSet<String>,
|
|
228
218
|
|
|
229
219
|
/// Per-panel `ResizeObserver`s, keyed by panel id, each observing that
|
|
230
220
|
/// panel's slotted plugin element and resizing only that panel's
|
|
@@ -388,8 +378,7 @@ impl Component for MainPanel {
|
|
|
388
378
|
layout_ref: NodeRef::default(),
|
|
389
379
|
inserted: Vec::new(),
|
|
390
380
|
pending_removals: HashSet::new(),
|
|
391
|
-
|
|
392
|
-
suspect_closes: HashSet::new(),
|
|
381
|
+
on_screen: HashSet::new(),
|
|
393
382
|
_layout_update_listener: listener,
|
|
394
383
|
_layout_select_listener: select_listener,
|
|
395
384
|
_layout_before_resize_listener: before_resize_listener,
|
|
@@ -442,7 +431,7 @@ impl Component for MainPanel {
|
|
|
442
431
|
);
|
|
443
432
|
}
|
|
444
433
|
|
|
445
|
-
self.size_staging_wrappers();
|
|
434
|
+
self.size_staging_wrappers(ctx);
|
|
446
435
|
self.reconcile(ctx);
|
|
447
436
|
self.stamp_frame_themes(ctx);
|
|
448
437
|
}
|
|
@@ -229,7 +229,8 @@ pub struct WorkspaceConfigUpdate {
|
|
|
229
229
|
#[ts(optional)]
|
|
230
230
|
pub active: OptionalUpdate<String>,
|
|
231
231
|
|
|
232
|
-
/// The layout tree to stage, naming `panels`
|
|
232
|
+
/// The layout tree to stage, naming every `panels` key (or, without
|
|
233
|
+
/// `panels`, every existing panel id) exactly once.
|
|
233
234
|
#[serde(default)]
|
|
234
235
|
#[ts(optional)]
|
|
235
236
|
pub layout: Option<crate::js::Layout>,
|