From 99158da788f33647eead0f810981fda83711d3d5 Mon Sep 17 00:00:00 2001 From: Andrew Stein Date: Fri, 25 Nov 2022 11:53:41 -0600 Subject: [PATCH] Upgrade to Yew 0.20.0 --- .../test/results/results.json | 2 +- .../test/results/results.json | 2 +- .../test/results/results.json | 4 +- .../test/results/results.json | 2 +- .../test/results/results.json | 2 +- rust/perspective-viewer/Cargo.lock | 113 ++++++++++-------- rust/perspective-viewer/Cargo.toml | 2 +- .../column_selector/active_column.rs | 2 +- .../column_selector/aggregate_selector.rs | 2 +- .../src/rust/components/config_selector.rs | 2 +- .../components/config_selector/filter_item.rs | 2 +- .../components/containers/dragdrop_list.rs | 2 +- .../rust/components/containers/radio_list.rs | 2 +- .../components/containers/scroll_panel.rs | 2 +- .../src/rust/components/containers/select.rs | 2 +- .../rust/components/containers/split_panel.rs | 2 +- .../src/rust/components/filter_dropdown.rs | 2 +- .../src/rust/components/function_dropdown.rs | 2 +- .../rust/components/number_column_style.rs | 2 +- .../src/rust/components/plugin_selector.rs | 2 +- .../src/rust/components/render_warning.rs | 2 +- .../src/rust/components/viewer.rs | 2 +- .../test/results/results.json | 34 +++--- 23 files changed, 104 insertions(+), 87 deletions(-) diff --git a/packages/perspective-jupyterlab/test/results/results.json b/packages/perspective-jupyterlab/test/results/results.json index 6a8ec3d836..f3c9bed5a2 100644 --- a/packages/perspective-jupyterlab/test/results/results.json +++ b/packages/perspective-jupyterlab/test/results/results.json @@ -1,5 +1,5 @@ { - "__GIT_COMMIT__": "c744efa438393bf46bf0d0801d9807fd86b64f51", + "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db", "resize_Config_should_show_by_default": "f492628efc5ce5c9e1bab910cf2557c9", "resize_Resize_the_container_causes_the_widget_to_resize": "96a80143ba27bf42cc22d69c4ff1692a", "resize_group_by_traitlet_works": "f86409c2ccbdf3613a4aa20fc24cc543", diff --git a/packages/perspective-viewer-d3fc/test/results/results.json b/packages/perspective-viewer-d3fc/test/results/results.json index 9d3924fbf0..212d39e5ea 100644 --- a/packages/perspective-viewer-d3fc/test/results/results.json +++ b/packages/perspective-viewer-d3fc/test/results/results.json @@ -1,5 +1,5 @@ { - "__GIT_COMMIT__": "be50bcdfb1c1160ccc560af452db54446386ffcf", + "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db", "area_shows_a_grid_without_any_settings_applied": "67bab9ea6654cc7cf7c7b096824e610a", "area_displays_visible_columns_": "9c195f0f7bf184a4cb9e727f1b37b301", "area_pivot_by_a_row": "fbae982b73c9cbf91be40a767cbbd3df", diff --git a/packages/perspective-viewer-datagrid/test/results/results.json b/packages/perspective-viewer-datagrid/test/results/results.json index ebfd171ec3..1f4dcc51b2 100644 --- a/packages/perspective-viewer-datagrid/test/results/results.json +++ b/packages/perspective-viewer-datagrid/test/results/results.json @@ -14,7 +14,7 @@ "superstore_displays_visible_columns_": "09dd14f0e60da0e8749b7dd514e929f0", "superstore_resets_viewable_area_when_the_logical_size_expands_": "e9dd1d275f46f6a0857e0168835d0b38", "superstore_resets_viewable_area_when_the_physical_size_expands_": "e469597235cc032619bc095a76f9ad6f", - "__GIT_COMMIT__": "ab9e46542b4d70e46e676ed6f39c9ec4828e5715", + "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db", "superstore_shows_a_grid_without_any_settings_applied": "192edc6b035af6432c5bd82d295987f1", "superstore_pivot_by_a_row": "709a4a6b40153d9bf013f90398ee568d", "superstore_pivot_by_two_rows": "23db46ccf9d8327ae992fe3b5f468b3b", @@ -28,6 +28,6 @@ "superstore_filters_filters_by_an_alpha_column": "4b9a40c2ffad050ff4cf059e22cb2b68", "superstore_filters_filters_with__in__comparator": "5882e2d2694519ba9880d0b2d5b19c44", "superstore_perspective-config-update_event_is_fired_when_column_style_is_changed": "3d03b2787f9b903050942052168f755a", - "superstore_Column_style_menu_opens_for_numeric_columns": "00994bacd3ef0dec04a14d12c1fa2d0c", + "superstore_Column_style_menu_opens_for_numeric_columns": "fc42b6bd729d72974f1f3c91dee18d8b", "superstore_Column_style_menu_opens_for_string_columns": "64ca2b3567212ac3b2a5184b7c033db5" } \ No newline at end of file diff --git a/packages/perspective-viewer-openlayers/test/results/results.json b/packages/perspective-viewer-openlayers/test/results/results.json index 8d8c27706a..dd1ef9bfe8 100644 --- a/packages/perspective-viewer-openlayers/test/results/results.json +++ b/packages/perspective-viewer-openlayers/test/results/results.json @@ -12,5 +12,5 @@ "superstore_filters_filters_by_a_numeric_column": "80705a191c3675ed34d3058874f09a00", "superstore_filters_filters_by_an_alpha_column": "80705a191c3675ed34d3058874f09a00", "superstore_filters_filters_with__in__comparator": "80705a191c3675ed34d3058874f09a00", - "__GIT_COMMIT__": "be50bcdfb1c1160ccc560af452db54446386ffcf" + "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db" } \ No newline at end of file diff --git a/packages/perspective-workspace/test/results/results.json b/packages/perspective-workspace/test/results/results.json index 034cb94f33..d3156f4afb 100644 --- a/packages/perspective-workspace/test/results/results.json +++ b/packages/perspective-workspace/test/results/results.json @@ -1,5 +1,5 @@ { - "__GIT_COMMIT__": "0d5624d88d56d51c0d034ec07f665c4f06581044", + "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db", "index_restore_workspace_with_detail_only": "d24f601369fbf86c853d4dd2894506e3", "index_Light_DOM_restore_workspace_with_detail_only": "e23bd42ed74c5efc2d067301b449027d", "index_Shadow_DOM_restore_workspace_with_detail_only": "aa44cdf6689ff93f68d4a4cffe292e09", diff --git a/rust/perspective-viewer/Cargo.lock b/rust/perspective-viewer/Cargo.lock index 1ce7281586..195c6c1af7 100644 --- a/rust/perspective-viewer/Cargo.lock +++ b/rust/perspective-viewer/Cargo.lock @@ -229,12 +229,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - [[package]] name = "cache-padded" version = "1.2.0" @@ -495,9 +489,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -510,9 +504,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -520,15 +514,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -537,9 +531,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-lite" @@ -558,9 +552,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2 1.0.40", "quote 1.0.20", @@ -569,21 +563,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -1096,6 +1090,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pinned" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +dependencies = [ + "futures", + "rustversion", + "thiserror", +] + [[package]] name = "plotters" version = "0.3.4" @@ -1201,6 +1206,23 @@ dependencies = [ "nom", ] +[[package]] +name = "prokio" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +dependencies = [ + "futures", + "gloo", + "num_cpus", + "once_cell", + "pin-project", + "pinned", + "tokio", + "tokio-stream", + "wasm-bindgen-futures", +] + [[package]] name = "quote" version = "0.6.13" @@ -1286,6 +1308,12 @@ dependencies = [ "serde", ] +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + [[package]] name = "ryu" version = "1.0.10" @@ -1439,18 +1467,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2 1.0.40", "quote 1.0.20", @@ -1494,6 +1522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95" dependencies = [ "autocfg", + "once_cell", "pin-project-lite", ] @@ -1506,20 +1535,6 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", ] [[package]] @@ -1777,8 +1792,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "yew" -version = "0.19.3" -source = "git+https://github.com/yewstack/yew?rev=7438cd3059d58d0922e4c15135961c8fab6f2552#7438cd3059d58d0922e4c15135961c8fab6f2552" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc" dependencies = [ "console_error_panic_hook", "futures", @@ -1786,12 +1802,12 @@ dependencies = [ "implicit-clone", "indexmap", "js-sys", - "once_cell", + "prokio", + "rustversion", "serde", "slab", "thiserror", "tokio", - "tokio-stream", "tracing", "wasm-bindgen", "wasm-bindgen-futures", @@ -1801,8 +1817,9 @@ dependencies = [ [[package]] name = "yew-macro" -version = "0.19.3" -source = "git+https://github.com/yewstack/yew?rev=7438cd3059d58d0922e4c15135961c8fab6f2552#7438cd3059d58d0922e4c15135961c8fab6f2552" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301" dependencies = [ "boolinator", "once_cell", diff --git a/rust/perspective-viewer/Cargo.toml b/rust/perspective-viewer/Cargo.toml index 1f38767e2b..71d073874f 100644 --- a/rust/perspective-viewer/Cargo.toml +++ b/rust/perspective-viewer/Cargo.toml @@ -97,7 +97,7 @@ wasm-bindgen = { version = "=0.2.82", features = ["serde-serialize"] } wasm-bindgen-futures = "0.4.20" # https://github.com/yewstack/yew/issues/2154 -yew = { git = "https://github.com/yewstack/yew", rev = "7438cd3059d58d0922e4c15135961c8fab6f2552", features = ["csr"] } +yew = { version = "0.20.0", features = ["csr"] } [dependencies.web-sys] version = "0.3.59" diff --git a/rust/perspective-viewer/src/rust/components/column_selector/active_column.rs b/rust/perspective-viewer/src/rust/components/column_selector/active_column.rs index 10a8a774ea..d9a0cd20b3 100644 --- a/rust/perspective-viewer/src/rust/components/column_selector/active_column.rs +++ b/rust/perspective-viewer/src/rust/components/column_selector/active_column.rs @@ -154,7 +154,7 @@ impl Component for ActiveColumn { } } - fn changed(&mut self, ctx: &Context) -> bool { + fn changed(&mut self, ctx: &Context, _old: &Self::Properties) -> bool { self.column_type = ctx.props().get_type(); self.is_required = ctx.props().get_is_required(); true diff --git a/rust/perspective-viewer/src/rust/components/column_selector/aggregate_selector.rs b/rust/perspective-viewer/src/rust/components/column_selector/aggregate_selector.rs index da46ea8cf7..1cd1d9f330 100644 --- a/rust/perspective-viewer/src/rust/components/column_selector/aggregate_selector.rs +++ b/rust/perspective-viewer/src/rust/components/column_selector/aggregate_selector.rs @@ -65,7 +65,7 @@ impl Component for AggregateSelector { } } - fn changed(&mut self, ctx: &Context) -> bool { + fn changed(&mut self, ctx: &Context, _old: &Self::Properties) -> bool { self.aggregates = self.get_dropdown_aggregates(ctx); true } diff --git a/rust/perspective-viewer/src/rust/components/config_selector.rs b/rust/perspective-viewer/src/rust/components/config_selector.rs index a05364f363..e6d4889a2d 100644 --- a/rust/perspective-viewer/src/rust/components/config_selector.rs +++ b/rust/perspective-viewer/src/rust/components/config_selector.rs @@ -258,7 +258,7 @@ impl Component for ConfigSelector { /// Should not render on change, as this component only depends on service /// state. - fn changed(&mut self, _ctx: &Context) -> bool { + fn changed(&mut self, _ctx: &Context, _old: &Self::Properties) -> bool { false } diff --git a/rust/perspective-viewer/src/rust/components/config_selector/filter_item.rs b/rust/perspective-viewer/src/rust/components/config_selector/filter_item.rs index f06347a6ac..bf076364ae 100644 --- a/rust/perspective-viewer/src/rust/components/config_selector/filter_item.rs +++ b/rust/perspective-viewer/src/rust/components/config_selector/filter_item.rs @@ -313,7 +313,7 @@ impl Component for FilterItem { } } - fn changed(&mut self, ctx: &Context) -> bool { + fn changed(&mut self, ctx: &Context, _old: &Self::Properties) -> bool { if let Some(input) = ctx.props().get_filter_input() { self.input = input; true diff --git a/rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs b/rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs index 0db2204d74..f29c27c5df 100644 --- a/rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs +++ b/rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs @@ -111,7 +111,7 @@ where } } - fn changed(&mut self, _ctx: &Context) -> bool { + fn changed(&mut self, _ctx: &Context, _old: &Self::Properties) -> bool { true } diff --git a/rust/perspective-viewer/src/rust/components/containers/radio_list.rs b/rust/perspective-viewer/src/rust/components/containers/radio_list.rs index 94b08325b9..11f12b173e 100644 --- a/rust/perspective-viewer/src/rust/components/containers/radio_list.rs +++ b/rust/perspective-viewer/src/rust/components/containers/radio_list.rs @@ -134,7 +134,7 @@ where false } - fn changed(&mut self, ctx: &Context) -> bool { + fn changed(&mut self, ctx: &Context, _old: &Self::Properties) -> bool { self.selected = ctx.props().selected.clone(); true } diff --git a/rust/perspective-viewer/src/rust/components/containers/scroll_panel.rs b/rust/perspective-viewer/src/rust/components/containers/scroll_panel.rs index 445fab3d0c..30f28fdfe9 100644 --- a/rust/perspective-viewer/src/rust/components/containers/scroll_panel.rs +++ b/rust/perspective-viewer/src/rust/components/containers/scroll_panel.rs @@ -232,7 +232,7 @@ where /// If the new total row height is different than last time this component /// was rendered, we need to double-render to read the container's /// potentially updated height. - fn changed(&mut self, ctx: &Context) -> bool { + fn changed(&mut self, ctx: &Context, _old: &Self::Properties) -> bool { let total_height = ctx.props().total_height(ctx); self.needs_rerender = self.needs_rerender || (self.total_height - total_height).abs() > 0.1f64; diff --git a/rust/perspective-viewer/src/rust/components/containers/select.rs b/rust/perspective-viewer/src/rust/components/containers/select.rs index 3947badbb0..845be66f44 100644 --- a/rust/perspective-viewer/src/rust/components/containers/select.rs +++ b/rust/perspective-viewer/src/rust/components/containers/select.rs @@ -111,7 +111,7 @@ where } // The `