From 1df9956a96233bbef5b72c384b9b9a17d54a6b13 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Sun, 27 Oct 2024 16:04:49 +0100 Subject: [PATCH] Fix layer merging order --- app/lib/views/navigator/layers.dart | 2 +- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- docs/pnpm-lock.yaml | 32 ++++++++++++++--------------- metadata/en-US/changelogs/120.txt | 1 + 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/lib/views/navigator/layers.dart b/app/lib/views/navigator/layers.dart index 816fec9f75b4..e35acd333b6b 100644 --- a/app/lib/views/navigator/layers.dart +++ b/app/lib/views/navigator/layers.dart @@ -73,8 +73,8 @@ class LayersView extends StatelessWidget { : () => context .read() .add(LayersMerged([ - id, layers[index - 1].id, + id, ].nonNulls.toList())), child: Text(AppLocalizations.of(context).up), ), diff --git a/app/pubspec.lock b/app/pubspec.lock index e47026590cf0..e51d28194678 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -822,8 +822,8 @@ packages: dependency: "direct main" description: path: "packages/lw_file_system" - ref: "71ebfd76ef24a9b21b2e909d5802e9fb01357317" - resolved-ref: "71ebfd76ef24a9b21b2e909d5802e9fb01357317" + ref: "1173f5e3f737e99fe6f6e13f6a28633fe9e7c6e4" + resolved-ref: "1173f5e3f737e99fe6f6e13f6a28633fe9e7c6e4" url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "1.0.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index e024dad021db..0d36f506731f 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -89,7 +89,7 @@ dependencies: lw_file_system: git: url: https://github.com/LinwoodDev/dart_pkgs - ref: 71ebfd76ef24a9b21b2e909d5802e9fb01357317 + ref: 1173f5e3f737e99fe6f6e13f6a28633fe9e7c6e4 path: packages/lw_file_system flutter_localized_locales: ^2.0.5 dynamic_color: ^1.7.0 diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 3aeed02ea65c..a44a71bb2d20 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -863,8 +863,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.13.0: - resolution: {integrity: sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==} + acorn@8.14.0: + resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} engines: {node: '>=0.4.0'} hasBin: true @@ -2441,8 +2441,8 @@ snapshots: '@astrojs/mdx@3.1.8(astro@4.16.7(rollup@4.24.1)(sass@1.80.4)(terser@5.36.0)(typescript@5.6.3))': dependencies: '@astrojs/markdown-remark': 5.3.0 - '@mdx-js/mdx': 3.1.0(acorn@8.13.0) - acorn: 8.13.0 + '@mdx-js/mdx': 3.1.0(acorn@8.14.0) + acorn: 8.14.0 astro: 4.16.7(rollup@4.24.1)(sass@1.80.4)(terser@5.36.0)(typescript@5.6.3) es-module-lexer: 1.5.4 estree-util-visit: 2.0.0 @@ -2880,7 +2880,7 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 - '@mdx-js/mdx@3.1.0(acorn@8.13.0)': + '@mdx-js/mdx@3.1.0(acorn@8.14.0)': dependencies: '@types/estree': 1.0.6 '@types/estree-jsx': 1.0.5 @@ -2894,7 +2894,7 @@ snapshots: hast-util-to-jsx-runtime: 2.3.2 markdown-extensions: 2.0.0 recma-build-jsx: 1.0.0 - recma-jsx: 1.0.0(acorn@8.13.0) + recma-jsx: 1.0.0(acorn@8.14.0) recma-stringify: 1.0.0 rehype-recma: 1.0.0 remark-mdx: 3.1.0 @@ -3225,11 +3225,11 @@ snapshots: '@vscode/l10n@0.0.18': {} - acorn-jsx@5.3.2(acorn@8.13.0): + acorn-jsx@5.3.2(acorn@8.14.0): dependencies: - acorn: 8.13.0 + acorn: 8.14.0 - acorn@8.13.0: {} + acorn@8.14.0: {} ajv@8.17.1: dependencies: @@ -3284,7 +3284,7 @@ snapshots: '@rollup/pluginutils': 5.1.3(rollup@4.24.1) '@types/babel__core': 7.20.5 '@types/cookie': 0.6.0 - acorn: 8.13.0 + acorn: 8.14.0 aria-query: 5.3.2 axobject-query: 4.1.0 boxen: 8.0.1 @@ -3521,7 +3521,7 @@ snapshots: esast-util-from-js@2.0.1: dependencies: '@types/estree-jsx': 1.0.5 - acorn: 8.13.0 + acorn: 8.14.0 esast-util-from-estree: 2.0.0 vfile-message: 4.0.2 @@ -4311,8 +4311,8 @@ snapshots: micromark-extension-mdxjs@3.0.0: dependencies: - acorn: 8.13.0 - acorn-jsx: 5.3.2(acorn@8.13.0) + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) micromark-extension-mdx-expression: 3.0.0 micromark-extension-mdx-jsx: 3.0.1 micromark-extension-mdx-md: 2.0.0 @@ -4631,9 +4631,9 @@ snapshots: estree-util-build-jsx: 3.0.1 vfile: 6.0.3 - recma-jsx@1.0.0(acorn@8.13.0): + recma-jsx@1.0.0(acorn@8.14.0): dependencies: - acorn-jsx: 5.3.2(acorn@8.13.0) + acorn-jsx: 5.3.2(acorn@8.14.0) estree-util-to-js: 2.0.0 recma-parse: 1.0.0 recma-stringify: 1.0.0 @@ -4969,7 +4969,7 @@ snapshots: terser@5.36.0: dependencies: '@jridgewell/source-map': 0.3.6 - acorn: 8.13.0 + acorn: 8.14.0 commander: 2.20.3 source-map-support: 0.5.21 optional: true diff --git a/metadata/en-US/changelogs/120.txt b/metadata/en-US/changelogs/120.txt index c28cf0011a01..7d2357d3e1b0 100644 --- a/metadata/en-US/changelogs/120.txt +++ b/metadata/en-US/changelogs/120.txt @@ -12,6 +12,7 @@ * Fix archive importing * Fix collaboration dialog * Fix navigator page large constraints +* Fix root directory bug on web * Upgrade networking stack for collaboration experiment * Update flutter and agp