diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bf9416..8670a6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0 + - uses: actions-rust-lang/setup-rust-toolchain@a188e68d0fd2bd36ad51dccb2b07ba6e75105f30 # v2.0.1 - name: Format run: cargo fmt --all -- --check - name: Docs @@ -29,7 +29,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0 + - uses: actions-rust-lang/setup-rust-toolchain@a188e68d0fd2bd36ad51dccb2b07ba6e75105f30 # v2.0.1 - name: Cargo check run: cargo check --locked --all-targets --all-features --workspace @@ -38,7 +38,7 @@ jobs: runs-on: macos-15 # For snapshot testing. steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0 + - uses: actions-rust-lang/setup-rust-toolchain@a188e68d0fd2bd36ad51dccb2b07ba6e75105f30 # v2.0.1 - name: Test run: cargo test --locked --workspace - name: Test for simd_json feature @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0 + - uses: actions-rust-lang/setup-rust-toolchain@a188e68d0fd2bd36ad51dccb2b07ba6e75105f30 # v2.0.1 - uses: jetli/trunk-action@1346cc09eace4beb84e403e199a471346d4684c9 # v0.5.1 with: version: "v0.21.14" diff --git a/Cargo.lock b/Cargo.lock index 847141a..9f15216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,18 +20,18 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" -version = "0.24.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320" +checksum = "4e883d1d28c5fd5568c79ed2d2bd48d9f2fd3945c8974ed0f53690ceddb051be" dependencies = [ "uuid", ] [[package]] name = "accesskit_atspi_common" -version = "0.18.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fd8203e6dfcf531d24f5bac792088edfba7d6b35844fead191603fb32a260" +checksum = "24f5baf62e34a4a6c30e3d697e4782f821a7337049c44c3b40576a27dfbb580d" dependencies = [ "accesskit", "accesskit_consumer", @@ -43,23 +43,37 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.35.0" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10" +checksum = "f3da8f27636015191b2264ee1df681503170a632cafd832fdc1edfdd4e3a2fd3" dependencies = [ "accesskit", - "hashbrown 0.16.1", + "hashbrown 0.17.1", +] + +[[package]] +name = "accesskit_ios" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5280724673bbfa8b30a838c013500b719392989be3b97c5a9964062c252c232" +dependencies = [ + "accesskit", + "accesskit_consumer", + "hashbrown 0.17.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-ui-kit 0.2.2", ] [[package]] name = "accesskit_macos" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534bc3fdc89a64a1db3c46b33c198fde2b7c3c7d094e5809c8c8bf2970c18243" +checksum = "123828ceeec755b05255e3976cb0852993202de98a0626c97dd8d34246991f84" dependencies = [ "accesskit", "accesskit_consumer", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", @@ -67,9 +81,9 @@ dependencies = [ [[package]] name = "accesskit_unix" -version = "0.21.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e549dd7c6562b6a2ea807b44726e6241707db054a817dc4c7e2b8d3b39bfac" +checksum = "30d5192871228c54f1b0fb4a85cef000e11a3804f25d2165f14afa0daa67f3f6" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -85,13 +99,13 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.32.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21" +checksum = "498668b90da9995302a0055aaecad4756932333da2ddef6baee1c00844c430fc" dependencies = [ "accesskit", "accesskit_consumer", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "static_assertions", "windows", "windows-core", @@ -99,11 +113,12 @@ dependencies = [ [[package]] name = "accesskit_winit" -version = "0.32.2" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313" +checksum = "cd4ab4437b520ff03088fbe48676a11e7d44a929535e64b31432c1073e48dbcc" dependencies = [ "accesskit", + "accesskit_ios", "accesskit_macos", "accesskit_unix", "accesskit_windows", @@ -193,6 +208,7 @@ dependencies = [ "parking_lot", "percent-encoding", "windows-sys 0.60.2", + "wl-clipboard-rs", "x11rb", ] @@ -316,7 +332,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -351,7 +367,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -484,7 +500,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -651,16 +667,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -674,7 +680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", "foreign-types", "libc", @@ -687,7 +693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "libc", ] @@ -788,7 +794,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -823,9 +829,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "ecolor" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc883f505d446814c0226bef4b64564b9adb9966fc00c88c57ce6d827dd152d6" +checksum = "31bcbef0d4263a63eb32c4834e5d711613035ce1333468e107d928923e21e6e2" dependencies = [ "bytemuck", "emath", @@ -833,9 +839,9 @@ dependencies = [ [[package]] name = "eframe" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afc0cbcdb6896b7bfb1dbbebaf7b9af9635ff38fd01e89bdd0174c1717b1857" +checksum = "9c5642501a65ca657d05f00c643a5c14ff2346cb3818032bfe23d58e1f8e5f84" dependencies = [ "ahash", "bytemuck", @@ -844,6 +850,7 @@ dependencies = [ "egui-wgpu", "egui-winit", "egui_glow", + "egui_system_font_provider", "glutin", "glutin-winit", "image", @@ -857,6 +864,7 @@ dependencies = [ "pollster", "profiling", "raw-window-handle", + "send_wrapper", "static_assertions", "wasm-bindgen", "web-sys", @@ -868,9 +876,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c977ac91dfaa651633fd9722e4ce9ccb32cda4c748b89a5cb57e504036e37c13" +checksum = "bec9144f49b7a28b5f395d3147e325b4fe3e77ba686eac11d1bdf0a7da3f375f" dependencies = [ "accesskit", "ahash", @@ -888,9 +896,9 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc362cc6bc8c1d7169c9cb0e7741ff1e03063681373d6e55cc3b25fd21213f3" +checksum = "0309cbe1febed48af5b974e4bcc424b35e9664863a4d402697147b57a488c864" dependencies = [ "ahash", "bytemuck", @@ -908,16 +916,18 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9327fc8edef2c57db9bcbcacc82c8a4b1e8cc64cd41a67db4419dcf643d88c83" +checksum = "e4e449f4c4a2a60c7ccb4ba7fa4078417bfe1f9ddc03b5e05ce75748e33a70de" dependencies = [ "accesskit_winit", "arboard", + "block2 0.6.2", "bytemuck", "egui", "log", "objc2 0.6.4", + "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "objc2-ui-kit 0.3.2", "profiling", @@ -925,14 +935,15 @@ dependencies = [ "smithay-clipboard", "web-time", "webbrowser", + "windows-sys 0.61.2", "winit", ] [[package]] name = "egui_glow" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b65e45f8d8d7c6d848b3ec41f642b54ad828033f1511d4b4c9adc09040166a" +checksum = "9275ca5cc35a6b7c94e0e8cedf22542f66cb0cf45ed8ab2657c78ff49fec7268" dependencies = [ "bytemuck", "egui", @@ -944,7 +955,7 @@ dependencies = [ [[package]] name = "egui_json_tree" -version = "0.17.0" +version = "0.18.0" dependencies = [ "egui", "egui_kittest", @@ -954,9 +965,9 @@ dependencies = [ [[package]] name = "egui_kittest" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9ea43248738d0396342e7b537b3a79568b2a5d16e8c3fdfc0d8bcbd89dbf6d" +checksum = "0979c2e37860fcf13a2bea77508607f067a9a6a84ba9bd47b5e298582fb59b86" dependencies = [ "dify", "eframe", @@ -973,6 +984,21 @@ dependencies = [ "wgpu", ] +[[package]] +name = "egui_system_font_provider" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2a2fdfe3c05dd9f691d2b1388b2312d6dce1af502f217c22136d22d9bd76f6" +dependencies = [ + "epaint", + "fontique", + "log", + "poll-promise", + "skrifa", + "sys-locale", + "unicode-script", +] + [[package]] name = "either" version = "1.15.0" @@ -981,9 +1007,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "emath" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce03cf1604f74515830012c29991beb0b58f69e4e43f5afe22fa7afed65ccd5" +checksum = "e73ce90f54750be8672c02be0743fe47530e6f251e066f0ee2869b59eb297af5" dependencies = [ "bytemuck", ] @@ -1012,14 +1038,14 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] name = "epaint" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11863a6b2b7823010c1090ddf4706947bdda46766742def0673195cbf7ff4a73" +checksum = "97bac86ae3dde93fc3951e790951caea739ff39a6c89d909cdaf1d9278dbb1bd" dependencies = [ "ahash", "bytemuck", @@ -1036,15 +1062,16 @@ dependencies = [ "skrifa", "smallvec", "unicode-general-category", + "unicode-properties", "unicode-segmentation", "vello_cpu", ] [[package]] name = "epaint_default_fonts" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dee69613aac468922cf28a32025eb7d7ed6985b61f73245848e58f37876c98" +checksum = "cfc1cc505827f4c23eedc297975a0fd038268d41293f389dd8ff3b574aefab19" [[package]] name = "equivalent" @@ -1121,7 +1148,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -1145,6 +1172,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" version = "1.1.9" @@ -1178,13 +1211,35 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "font-types" -version = "0.12.3" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75382bc7392ef10aad10935f92fc3db36d2d4dad0e5d96d8d65e04f89a07ec39" +checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d" dependencies = [ "bytemuck", ] +[[package]] +name = "fontique" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6688bc1294fe7117d788937b6c53480169b29c566954af490830d4c09da9516a" +dependencies = [ + "hashbrown 0.17.1", + "linebender_resource_handle", + "memmap2", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-core-text", + "objc2-foundation 0.3.2", + "parlance", + "read-fonts", + "roxmltree", + "smallvec", + "windows", + "windows-core", + "yeslogic-fontconfig-sys", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1203,7 +1258,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -1254,7 +1309,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -1346,15 +1401,16 @@ dependencies = [ [[package]] name = "glifo" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a" +checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be" dependencies = [ "bytemuck", "foldhash 0.2.0", "hashbrown 0.17.1", "log", "peniko", + "png", "skrifa", "smallvec", "vello_common", @@ -1747,7 +1803,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn", + "syn 2.0.117", ] [[package]] @@ -1775,7 +1831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -1818,9 +1874,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kittest" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5" +checksum = "0bb81a721ba76aa095b7f45deb180504f786904e56ca4b8e141f66eb89a78b75" dependencies = [ "accesskit", "accesskit_consumer", @@ -1982,9 +2038,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "memchr" @@ -2104,6 +2160,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2133,7 +2198,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -2184,6 +2249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.13.0", + "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", "objc2-core-graphics", @@ -2274,6 +2340,16 @@ dependencies = [ "objc2-foundation 0.2.2", ] +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags 2.13.0", + "objc2-core-foundation", +] + [[package]] name = "objc2-encode" version = "4.1.0" @@ -2491,6 +2567,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "os_pipe" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "owned_ttf_parser" version = "0.25.1" @@ -2529,6 +2615,12 @@ dependencies = [ "windows-link", ] +[[package]] +name = "parlance" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73072a9470554c8e794778acece2312661218aaabb635600957d952cf01c716e" + [[package]] name = "peniko" version = "0.6.1" @@ -2548,11 +2640,22 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "petgraph" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" +dependencies = [ + "fixedbitset", + "hashbrown 0.15.5", + "indexmap", +] + [[package]] name = "phf" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6" dependencies = [ "phf_macros", "phf_shared", @@ -2561,9 +2664,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100" dependencies = [ "fastrand", "phf_shared", @@ -2571,22 +2674,22 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] name = "phf_shared" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89" dependencies = [ "siphasher", ] @@ -2608,7 +2711,7 @@ checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -2653,6 +2756,16 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "poll-promise" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6a58fecbf9da8965bcdb20ce4fd29788d1acee68ddbb64f0ba1b81bccdb7df" +dependencies = [ + "document-features", + "static_assertions", +] + [[package]] name = "polling" version = "3.11.0" @@ -2719,7 +2832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn", + "syn 2.0.117", ] [[package]] @@ -2897,7 +3010,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -2906,6 +3019,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" +[[package]] +name = "roxmltree" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da7f59328b09405b181fee1018925fad50f157afb43c0c0f5c522c256dd5907" +dependencies = [ + "memchr", +] + [[package]] name = "rustc-hash" version = "1.1.0" @@ -3011,6 +3133,12 @@ version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.228" @@ -3038,7 +3166,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -3062,7 +3190,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -3161,9 +3289,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.1" +version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" [[package]] name = "smithay-client-toolkit" @@ -3275,6 +3403,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.13.2" @@ -3283,7 +3422,16 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", +] + +[[package]] +name = "sys-locale" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" +dependencies = [ + "libc", ] [[package]] @@ -3334,7 +3482,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -3345,7 +3493,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -3407,7 +3555,7 @@ dependencies = [ "serde_spanned", "toml_datetime", "toml_parser", - "winnow 1.0.0", + "winnow", ] [[package]] @@ -3428,7 +3576,7 @@ dependencies = [ "indexmap", "toml_datetime", "toml_parser", - "winnow 1.0.0", + "winnow", ] [[package]] @@ -3437,7 +3585,7 @@ version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" dependencies = [ - "winnow 1.0.0", + "winnow", ] [[package]] @@ -3460,7 +3608,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -3472,6 +3620,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tree_magic_mini" +version = "3.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6" +dependencies = [ + "memchr", + "nom", + "petgraph", +] + [[package]] name = "ttf-parser" version = "0.25.1" @@ -3510,6 +3669,18 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + +[[package]] +name = "unicode-script" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" + [[package]] name = "unicode-segmentation" version = "1.13.2" @@ -3571,28 +3742,30 @@ dependencies = [ [[package]] name = "vello_common" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2" +checksum = "bbb2141a2bca6e6d598e471fd4d1d7eed8e020aad6a28187edda07f091a325dd" dependencies = [ "bytemuck", "fearless_simd", "guillotiere", "log", "peniko", + "png", "smallvec", "thiserror 2.0.18", ] [[package]] name = "vello_cpu" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea" +checksum = "ace506ca414548966fcf3c283be94eb1cad8254de488791ee698bf438b0890a9" dependencies = [ "bytemuck", "glifo", "hashbrown 0.17.1", + "png", "vello_common", ] @@ -3678,7 +3851,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn", + "syn 2.0.117", "wasm-bindgen-shared", ] @@ -3882,15 +4055,15 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.0" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe985f41e291eecef5e5c0770a18d28390addb03331c043964d9e916453d6f16" +checksum = "d2c8ddfbbf66e501434657400268cefe51b95140a0266236415cda7627732df7" dependencies = [ - "core-foundation 0.10.1", "jni", "log", "ndk-context", "objc2 0.6.4", + "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "url", "web-sys", @@ -4147,7 +4320,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -4158,7 +4331,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -4384,7 +4557,7 @@ dependencies = [ "calloop 0.13.0", "cfg_aliases", "concurrent-queue", - "core-foundation 0.9.4", + "core-foundation", "core-graphics", "cursor-icon", "dpi", @@ -4421,15 +4594,6 @@ dependencies = [ "xkbcommon-dl", ] -[[package]] -name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.0" @@ -4469,7 +4633,7 @@ dependencies = [ "heck", "indexmap", "prettyplease", - "syn", + "syn 2.0.117", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -4485,7 +4649,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn", + "syn 2.0.117", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -4527,6 +4691,24 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "wl-clipboard-rs" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "959c7ac3b8afde864f7a7448ac16f29b2b83350b7eccbf77fb781c3999aa6848" +dependencies = [ + "libc", + "log", + "os_pipe", + "rustix 1.1.4", + "thiserror 2.0.18", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + [[package]] name = "writeable" version = "0.6.2" @@ -4596,6 +4778,17 @@ version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8b8abf912b9a29ff112e1671c97c33636903d13a69712037190e6805af4f76" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + [[package]] name = "yoke" version = "0.8.1" @@ -4615,15 +4808,15 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", "synstructure", ] [[package]] name = "zbus" -version = "5.14.0" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc" +checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907" dependencies = [ "async-broadcast", "async-executor", @@ -4648,7 +4841,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 0.7.15", + "winnow", "zbus_macros", "zbus_names", "zvariant", @@ -4672,7 +4865,7 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", "zbus-lockstep", "zbus_xml", "zvariant", @@ -4680,14 +4873,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.14.0" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222" +checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 3.0.9", "zbus_names", "zvariant", "zvariant_utils", @@ -4695,12 +4888,12 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.1" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" +checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd" dependencies = [ "serde", - "winnow 0.7.15", + "winnow", "zvariant", ] @@ -4716,6 +4909,15 @@ dependencies = [ "zvariant", ] +[[package]] +name = "zcheapstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473" +dependencies = [ + "serde", +] + [[package]] name = "zerocopy" version = "0.8.47" @@ -4733,7 +4935,7 @@ checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -4753,7 +4955,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", "synstructure", ] @@ -4787,7 +4989,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -4813,40 +5015,41 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.10.0" +version = "5.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b" +checksum = "80bf6d6cd6a4b601acb64cfb8284cdc643fcfa75ef26ae3c46ec8aa4e8a1fbb7" dependencies = [ "endi", "enumflags2", "serde", - "winnow 0.7.15", + "winnow", + "zcheapstr", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.10.0" +version = "5.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c" +checksum = "ef2672456ba1cb54b5eaec136e63135b3c7495fb938e53b28a62e633496d486d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 3.0.9", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "3.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" +checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3" dependencies = [ "proc-macro2", "quote", "serde", - "syn", - "winnow 0.7.15", + "syn 3.0.9", + "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index 55ccb66..30f69b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ authors = ["Duncan MacKinnon "] repository = "https://github.com/dmackdev/egui_json_tree" [workspace.dependencies] -egui = { version = "0.36", default-features = false } -eframe = "0.36" -egui_kittest = "0.36" +egui = { version = "0.37", default-features = false } +eframe = "0.37" +egui_kittest = "0.37" serde_json = { version = "1" } diff --git a/demo/src/apps/editor.rs b/demo/src/apps/editor.rs index 6c46726..6ec4ae7 100644 --- a/demo/src/apps/editor.rs +++ b/demo/src/apps/editor.rs @@ -69,8 +69,12 @@ impl Editor { .map(|parent| parent.to_json_pointer_string()) .is_some_and(|object_pointer| object_pointer == state.object_pointer) { - let enter_was_pressed_with_focus = - Self::show_text_edit(ui, &mut state.new_key_input, &mut state.request_focus); + let enter_was_pressed_with_focus = Self::show_text_edit( + ui, + "Enter key", + &mut state.new_key_input, + &mut state.request_focus, + ); ui.add_space(5.0); @@ -81,14 +85,15 @@ impl Editor { .is_some_and(|obj| !obj.contains_key(&state.new_key_input)); ui.add_enabled_ui(valid_key, |ui| { - if ui.small_button("✅").clicked() || (valid_key && enter_was_pressed_with_focus) { + if ui.small_button("Save").clicked() || (valid_key && enter_was_pressed_with_focus) + { edit_events.push(EditEvent::SaveObjectKeyEdit); } }); ui.add_space(5.0); - if ui.small_button("❌").clicked() { + if ui.small_button("Cancel").clicked() { if state.is_new_key { edit_events.push(EditEvent::DeleteFromObject { object_pointer: state.object_pointer.to_string(), @@ -111,18 +116,22 @@ impl Editor { if let RenderContext::BaseValue(context) = &context && state.pointer == context.pointer.to_json_pointer_string() { - let enter_was_pressed_with_focus = - Self::show_text_edit(ui, &mut state.new_value_input, &mut state.request_focus); + let enter_was_pressed_with_focus = Self::show_text_edit( + ui, + "Enter value", + &mut state.new_value_input, + &mut state.request_focus, + ); ui.add_space(5.0); - if ui.small_button("✅").clicked() || enter_was_pressed_with_focus { + if ui.small_button("Save").clicked() || enter_was_pressed_with_focus { edit_events.push(EditEvent::SaveValueEdit); } ui.add_space(5.0); - if ui.small_button("❌").clicked() { + if ui.small_button("Cancel").clicked() { edit_events.push(EditEvent::CloseValueEdit); } return; @@ -282,11 +291,18 @@ impl Editor { } /// Returns `bool` indicating whether the Enter key was pressed whilst the text edit had focus. - fn show_text_edit(ui: &mut Ui, input: &mut String, request_focus: &mut bool) -> bool { + fn show_text_edit( + ui: &mut Ui, + hint_text: &str, + input: &mut String, + request_focus: &mut bool, + ) -> bool { // Wrap in horizontal to prevent jitters when typing when children are expanded (due to use of horizontal_wrapped when rendering properties). let text_edit_output = ui .horizontal(|ui| { TextEdit::singleline(input) + // Sets accessibility label + .hint_text(hint_text) .code_editor() .margin(Margin::symmetric(2, 0)) .clip_text(false) @@ -465,15 +481,19 @@ impl Show for JsonEditorExample { #[cfg(test)] mod tests { use egui::{Key, accesskit::Role}; - use egui_kittest::{Harness, kittest::Queryable}; + use egui_kittest::{HarnessBuilder, kittest::Queryable}; use serde_json::json; use crate::apps::{Show, editor::JsonEditorExample}; + fn harness() -> HarnessBuilder { + HarnessBuilder::default() + } + #[test] fn add_to_array() { let mut app = JsonEditorExample::new(json!({ "abc": 123, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -494,7 +514,7 @@ mod tests { #[test] fn delete_from_array() { let mut app = JsonEditorExample::new(json!({ "abc": 123, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -515,7 +535,7 @@ mod tests { #[test] fn edit_array_element() { let mut app = JsonEditorExample::new(json!({ "abc": 123, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -534,7 +554,7 @@ mod tests { harness.root().type_text("foo"); harness.run(); - harness.get_by_role_and_label(Role::Button, "✅").click(); + harness.get_by_role_and_label(Role::Button, "Save").click(); harness.run(); assert!(harness.query_by_role(Role::TextInput).is_none()); @@ -546,7 +566,7 @@ mod tests { #[test] fn add_to_object() { let mut app = JsonEditorExample::new(json!({ "abc": { "baz": "qux" }, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -565,7 +585,7 @@ mod tests { harness.root().type_text("foo"); harness.run(); - harness.get_by_role_and_label(Role::Button, "✅").click(); + harness.get_by_role_and_label(Role::Button, "Save").click(); harness.run(); assert!(harness.query_by_role(Role::TextInput).is_none()); @@ -580,7 +600,7 @@ mod tests { #[test] fn edit_object_key() { let mut app = JsonEditorExample::new(json!({ "abc": { "baz": "qux" }, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -599,7 +619,7 @@ mod tests { harness.root().type_text("foo"); harness.run(); - harness.get_by_role_and_label(Role::Button, "✅").click(); + harness.get_by_role_and_label(Role::Button, "Save").click(); harness.run(); assert!(harness.query_by_role(Role::TextInput).is_none()); @@ -614,7 +634,7 @@ mod tests { #[test] fn when_edit_object_key_can_save_with_enter_key() { let mut app = JsonEditorExample::new(json!({ "abc": { "baz": "qux" }, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -650,7 +670,7 @@ mod tests { let original_json = json!({ "abc": { "baz": "qux" }, "def": [5, 6, 7] }); let mut app = JsonEditorExample::new(original_json.clone()); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); @@ -669,7 +689,9 @@ mod tests { harness.root().type_text("foo"); harness.run(); - harness.get_by_role_and_label(Role::Button, "❌").click(); + harness + .get_by_role_and_label(Role::Button, "Cancel") + .click(); harness.run(); assert!(harness.query_by_role(Role::TextInput).is_none()); @@ -681,7 +703,7 @@ mod tests { #[test] fn delete_from_object() { let mut app = JsonEditorExample::new(json!({ "abc": { "baz": "qux" }, "def": [5, 6, 7] })); - let mut harness = Harness::new_ui(|ui| { + let mut harness = harness().build_ui(|ui| { app.show(ui); }); diff --git a/egui_json_tree/Cargo.toml b/egui_json_tree/Cargo.toml index e26bd84..c5a978b 100644 --- a/egui_json_tree/Cargo.toml +++ b/egui_json_tree/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_json_tree" -version = "0.17.0" +version = "0.18.0" description = "An interactive JSON tree visualiser for egui, with search and highlight functionality." keywords = ["json", "egui", "gui", "ui", "widget"] categories = ["gui", "visualization"] @@ -25,5 +25,8 @@ serde_json = ["dep:serde_json"] simd_json = ["dep:simd-json"] [dev-dependencies] -egui = { workspace = true, default-features = true } # egui_kittest snapshot testing needs default features +# egui_kittest snapshot testing needs default features +egui = { workspace = true, default-features = true, features = [ + "default_fonts", +] } egui_kittest = { workspace = true, features = ["wgpu", "snapshot"] } diff --git a/egui_json_tree/src/node.rs b/egui_json_tree/src/node.rs index adc5455..7093d50 100644 --- a/egui_json_tree/src/node.rs +++ b/egui_json_tree/src/node.rs @@ -28,7 +28,7 @@ pub(crate) struct JsonTreeNode<'a, 'b, T: ToJsonTreeValue> { impl<'a, 'b, T: ToJsonTreeValue> JsonTreeNode<'a, 'b, T> { pub(crate) fn show(tree: JsonTree<'a, T>, ui: &mut Ui) -> JsonTreeResponse { - let persistent_id = ui.id(); + let persistent_id = ui.scope_id(); let tree_id = tree.id; let make_persistent_id = |path_segments: &[JsonPointerSegment]| persistent_id.with(tree_id.with(path_segments)); @@ -210,9 +210,16 @@ impl<'a, 'b, T: ToJsonTreeValue> JsonTreeNode<'a, 'b, T> { #[cfg(test)] _response.widget_info(|| { egui::WidgetInfo::labeled( - egui::WidgetType::CollapsingHeader, + egui::Role::DisclosureTriangle, ui.is_enabled(), - JsonPointer(path_segments).to_json_pointer_string(), + // Empty string (i.e. root of the JSON document) is not a valid accessibility label, + // and kittest will error if we don't disable accessibility checks. + // Hence we use this sentinel (which is not a valid JSON pointer). + if path_segments.is_empty() { + "$root".to_string() + } else { + JsonPointer(path_segments).to_json_pointer_string() + }, ) }); }); diff --git a/egui_json_tree/src/tree.rs b/egui_json_tree/src/tree.rs index 7072e41..60eccda 100644 --- a/egui_json_tree/src/tree.rs +++ b/egui_json_tree/src/tree.rs @@ -4,7 +4,7 @@ use crate::{ render::{JsonTreeRenderer, RenderContext}, value::ToJsonTreeValue, }; -use egui::{AsId, Id, Ui}; +use egui::{AsIdSalt, Id, Ui}; pub(crate) struct JsonTreeConfig<'a, T: ToJsonTreeValue> { pub(crate) style: Option, @@ -35,9 +35,9 @@ pub struct JsonTree<'a, T: ToJsonTreeValue> { impl<'a, T: ToJsonTreeValue> JsonTree<'a, T> { /// Creates a new [`JsonTree`]. /// `id` must be a globally unique identifier. - pub fn new(id: impl AsId, value: &'a T) -> Self { + pub fn new(id: impl AsIdSalt, value: &'a T) -> Self { Self { - id: Id::new(id), + id: Id::unique(id), value, config: JsonTreeConfig::default(), } @@ -114,9 +114,9 @@ mod tests { use std::sync::LazyLock; use egui::accesskit::Role; - use egui_kittest::Node; use egui_kittest::kittest::NodeT; use egui_kittest::{Harness, kittest::Queryable}; + use egui_kittest::{HarnessBuilder, Node}; use serde_json::{Value, json}; use crate::{DefaultExpand, JsonTree, JsonTreeStyle, ToggleButtonsState}; @@ -135,9 +135,26 @@ mod tests { }) }); + fn harness() -> HarnessBuilder { + HarnessBuilder::default() + } + + fn query_all_collapsing_headers<'a, S>( + harness: &'a Harness<'_, S>, + ) -> impl Iterator> { + harness.query_all_by_role(Role::DisclosureTriangle) + } + + fn get_collapsing_header_node<'a, S>( + harness: &'a Harness<'_, S>, + pointer: &'a str, + ) -> Node<'a> { + harness.get_by_role_and_label(Role::DisclosureTriangle, pointer) + } + #[test] fn render_object_with_toggle_buttons_visible_disabled() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::All) .style( @@ -154,7 +171,7 @@ mod tests { #[test] fn render_object_with_toggle_buttons_visible_enabled() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::All) .style( @@ -171,7 +188,7 @@ mod tests { #[test] fn render_object_with_toggle_buttons_hidden() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::All) .style(JsonTreeStyle::new().toggle_buttons_state(ToggleButtonsState::Hidden)) @@ -183,7 +200,7 @@ mod tests { #[test] fn render_object_with_interaction_and_manual_reset_expanded() { - let mut harness = Harness::new_ui_state( + let mut harness = harness().build_ui_state( |ui, should_reset_expanded| { let response = JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::None) @@ -200,7 +217,7 @@ mod tests { assert_eq!(query_all_collapsing_headers(&harness).count(), 1); assert_eq!(harness.query_all_by_role(Role::Label).count(), 1); - get_collapsing_header_node(&harness, "").click(); + get_collapsing_header_node(&harness, "$root").click(); harness.run(); assert_eq!(query_all_collapsing_headers(&harness).count(), 3); assert_eq!(harness.query_all_by_role(Role::Label).count(), 11); @@ -223,7 +240,7 @@ mod tests { #[test] fn render_object_with_default_expand_none_and_abbreviated_root() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::None) .style(JsonTreeStyle::new().abbreviate_root(true)) @@ -235,7 +252,7 @@ mod tests { #[test] fn render_array_with_default_expand_none_and_abbreviated_root() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &json!([1, 2, 3])) .default_expand(DefaultExpand::None) .style(JsonTreeStyle::new().abbreviate_root(true)) @@ -248,7 +265,7 @@ mod tests { #[test] fn render_object_with_default_expand_search_results_or_all_when_empty_string_expands_everything() { - let harness = Harness::new_ui(|ui| { + let harness = harness().build_ui(|ui| { JsonTree::new("id", &*OBJECT) .default_expand(DefaultExpand::SearchResultsOrAll("")) .show(ui); @@ -256,17 +273,4 @@ mod tests { assert_eq!(query_all_collapsing_headers(&harness).count(), 3); assert_eq!(harness.query_all_by_role(Role::Label).count(), 25); } - - fn query_all_collapsing_headers<'a, S>( - harness: &'a Harness<'_, S>, - ) -> impl Iterator> { - harness.query_all_by_role(Role::Button) - } - - fn get_collapsing_header_node<'a, S>( - harness: &'a Harness<'_, S>, - pointer: &'a str, - ) -> Node<'a> { - harness.get_by_role_and_label(Role::Button, pointer) - } } diff --git a/egui_json_tree/tests/snapshots/changing_default_expand/0_None.png b/egui_json_tree/tests/snapshots/changing_default_expand/0_None.png index f3e5a13..a84dc2a 100644 Binary files a/egui_json_tree/tests/snapshots/changing_default_expand/0_None.png and b/egui_json_tree/tests/snapshots/changing_default_expand/0_None.png differ diff --git a/egui_json_tree/tests/snapshots/changing_default_expand/1_ToLevel(2).png b/egui_json_tree/tests/snapshots/changing_default_expand/1_ToLevel(2).png index 986d754..f418e6c 100644 Binary files a/egui_json_tree/tests/snapshots/changing_default_expand/1_ToLevel(2).png and b/egui_json_tree/tests/snapshots/changing_default_expand/1_ToLevel(2).png differ diff --git a/egui_json_tree/tests/snapshots/changing_default_expand/2_SearchResults(gree).png b/egui_json_tree/tests/snapshots/changing_default_expand/2_SearchResults(gree).png index c1e1537..5d05ea5 100644 Binary files a/egui_json_tree/tests/snapshots/changing_default_expand/2_SearchResults(gree).png and b/egui_json_tree/tests/snapshots/changing_default_expand/2_SearchResults(gree).png differ diff --git a/egui_json_tree/tests/snapshots/changing_default_expand/3_All.png b/egui_json_tree/tests/snapshots/changing_default_expand/3_All.png index d6404bb..76a0cfc 100644 Binary files a/egui_json_tree/tests/snapshots/changing_default_expand/3_All.png and b/egui_json_tree/tests/snapshots/changing_default_expand/3_All.png differ diff --git a/egui_json_tree/tests/snapshots/changing_default_expand/4_SearchResultsOrAll(null).png b/egui_json_tree/tests/snapshots/changing_default_expand/4_SearchResultsOrAll(null).png index da67205..214461e 100644 Binary files a/egui_json_tree/tests/snapshots/changing_default_expand/4_SearchResultsOrAll(null).png and b/egui_json_tree/tests/snapshots/changing_default_expand/4_SearchResultsOrAll(null).png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_search_results/0_SearchResults().png b/egui_json_tree/tests/snapshots/default_expand_search_results/0_SearchResults().png index f3e5a13..a84dc2a 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_search_results/0_SearchResults().png and b/egui_json_tree/tests/snapshots/default_expand_search_results/0_SearchResults().png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_search_results/1_SearchResults(g).png b/egui_json_tree/tests/snapshots/default_expand_search_results/1_SearchResults(g).png index 72f57c2..18bb098 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_search_results/1_SearchResults(g).png and b/egui_json_tree/tests/snapshots/default_expand_search_results/1_SearchResults(g).png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_search_results/2_SearchResults(gr).png b/egui_json_tree/tests/snapshots/default_expand_search_results/2_SearchResults(gr).png index f5e7723..878dd7c 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_search_results/2_SearchResults(gr).png and b/egui_json_tree/tests/snapshots/default_expand_search_results/2_SearchResults(gr).png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_search_results/3_SearchResults(gre).png b/egui_json_tree/tests/snapshots/default_expand_search_results/3_SearchResults(gre).png index ce91bfd..3cb2da9 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_search_results/3_SearchResults(gre).png and b/egui_json_tree/tests/snapshots/default_expand_search_results/3_SearchResults(gre).png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_search_results/4_SearchResults(gree).png b/egui_json_tree/tests/snapshots/default_expand_search_results/4_SearchResults(gree).png index c1e1537..5d05ea5 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_search_results/4_SearchResults(gree).png and b/egui_json_tree/tests/snapshots/default_expand_search_results/4_SearchResults(gree).png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_to_level/0.png b/egui_json_tree/tests/snapshots/default_expand_to_level/0.png index 9264df1..26365a2 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_to_level/0.png and b/egui_json_tree/tests/snapshots/default_expand_to_level/0.png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_to_level/1.png b/egui_json_tree/tests/snapshots/default_expand_to_level/1.png index e38ad04..136141a 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_to_level/1.png and b/egui_json_tree/tests/snapshots/default_expand_to_level/1.png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_to_level/2.png b/egui_json_tree/tests/snapshots/default_expand_to_level/2.png index 986d754..f418e6c 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_to_level/2.png and b/egui_json_tree/tests/snapshots/default_expand_to_level/2.png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_to_level/3.png b/egui_json_tree/tests/snapshots/default_expand_to_level/3.png index 139e37b..fa9fa87 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_to_level/3.png and b/egui_json_tree/tests/snapshots/default_expand_to_level/3.png differ diff --git a/egui_json_tree/tests/snapshots/default_expand_to_level/4.png b/egui_json_tree/tests/snapshots/default_expand_to_level/4.png index d6404bb..76a0cfc 100644 Binary files a/egui_json_tree/tests/snapshots/default_expand_to_level/4.png and b/egui_json_tree/tests/snapshots/default_expand_to_level/4.png differ diff --git a/egui_json_tree/tests/snapshots/render_object_with_default_expand_all.png b/egui_json_tree/tests/snapshots/render_object_with_default_expand_all.png index 2748209..a5f1112 100644 Binary files a/egui_json_tree/tests/snapshots/render_object_with_default_expand_all.png and b/egui_json_tree/tests/snapshots/render_object_with_default_expand_all.png differ diff --git a/egui_json_tree/tests/snapshots/render_object_with_default_expand_none.png b/egui_json_tree/tests/snapshots/render_object_with_default_expand_none.png index 22e84e4..cca93a3 100644 Binary files a/egui_json_tree/tests/snapshots/render_object_with_default_expand_none.png and b/egui_json_tree/tests/snapshots/render_object_with_default_expand_none.png differ