From 006793a70fac13d79583f9d3881a6c648d5f10ab Mon Sep 17 00:00:00 2001 From: Alesia <104492428+alesiaradkevich@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:10:36 +0300 Subject: [PATCH] update to 1.1.3 (#32) --- CHANGELOG.md | 3 +++ example/pubspec.lock | 50 ++++++++++++++++++++++---------------------- lib/src/sheet.dart | 24 +++++++-------------- pubspec.yaml | 5 +++-- 4 files changed, 39 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e68994..448af7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.1.3 +* **Updates to support flutter version 3.16.0** + ## 1.1.2 * **Fixed bug with Scrollbar when showScrollbar=true** diff --git a/example/pubspec.lock b/example/pubspec.lock index 0517915..09f921a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" community_charts_common: dependency: transitive description: @@ -91,14 +91,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.18.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" lints: dependency: transitive description: @@ -111,18 +103,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" material_design_icons_flutter: dependency: "direct main" description: @@ -135,10 +127,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -156,26 +148,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -196,10 +188,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" vector_math: dependency: transitive description: @@ -208,6 +200,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" wtf_sliding_sheet: dependency: "direct main" description: @@ -217,5 +217,5 @@ packages: source: hosted version: "1.0.0" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.5.0" diff --git a/lib/src/sheet.dart b/lib/src/sheet.dart index abdc2cc..c45ea4f 100644 --- a/lib/src/sheet.dart +++ b/lib/src/sheet.dart @@ -212,23 +212,23 @@ class SlidingSheet extends StatefulWidget { /// (far right). /// /// Defaults to `0.0` (center). - /// {@endTemplate} + /// {@endtemplate} final double axisAlignment; /// {@template sliding_sheet.extendBody} /// Whether to extend the scrollable body of the sheet under /// header and/or footer. - /// {@endTemplate} + /// {@endtemplate} final bool extendBody; /// {@template sliding_sheet.liftOnScrollHeaderElevation} /// The elevation of the header when the content scrolls under it. - /// {@endTemplate} + /// {@endtemplate} final double liftOnScrollHeaderElevation; /// {@template sliding_sheet.liftOnScrollFooterElevation} /// The elevation of the footer when there content scrolls under it. - /// {@endTemplate} + /// {@endtemplate} final double liftOnScrollFooterElevation; // * SlidingSheetDialog fields @@ -704,14 +704,11 @@ class _SlidingSheetState extends State switch (snapPositioning) { case SnapPositioning.relativeToAvailableSpace: isValidRelativeSnap(); - break; case SnapPositioning.relativeToSheetHeight: isValidRelativeSnap(); extent = (snap * maxHeight) / availableHeight; - break; case SnapPositioning.pixelOffset: extent = snap / availableHeight; - break; default: return snap.clamp(0.0, 1.0); } @@ -1287,15 +1284,12 @@ class _SlidingSheetState extends State return result; } - return WillPopScope( - child: result, - onWillPop: () async { + return PopScope( + canPop: state.isCollapsed && widget.isDismissable, + onPopInvoked: (_) { if (isDialog) { if (!widget.isDismissable) { _onDismissPrevented(backButton: true); - return false; - } else { - return true; } } else { if (!state.isCollapsed) { @@ -1304,12 +1298,10 @@ class _SlidingSheetState extends State } else { _pop(velocity: 0, isBackDrop: false, isBackButton: true); } - return false; - } else { - return true; } } }, + child: result, ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 72d847e..7b36312 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: wtf_sliding_sheet description: A widget that can be dragged and scrolled in a single gesture and snapped to a list of extents. -version: 1.1.2 +version: 1.1.3 homepage: https://pub.dev/packages/wtf_sliding_sheet repository: https://github.com/What-the-Flutter/wtf_sliding_sheet @@ -10,7 +10,8 @@ topics: - dialog environment: - sdk: '>=2.17.0 <4.0.0' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: