Fix PR issues

forus-labs · Dec 8, 2024 · c2ff069 · c2ff069
1 parent 1c11cf5
commit c2ff069
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/docs/pages/docs/overlay/_meta.ts b/docs/pages/docs/overlay/_meta.ts
@@ -1,8 +1,8 @@
 export default {
   dialog: 'Dialog',
+  sheet: 'Sheet',
+  'persistent-sheet': 'Persistent Sheet',
   popover: 'Popover',
   'popover-menu': 'Popover Menu',
-  'modal-sheet': 'Modal Sheet',
-  'persistent-sheet': 'Persistent Sheet',
   tooltip: 'Tooltip',
 };
diff --git a/docs/pages/docs/overlay/persistent-sheet.mdx b/docs/pages/docs/overlay/persistent-sheet.mdx
@@ -5,17 +5,19 @@ import LinkBadgeGroup from "../../../components/link-badge/link-badge-group.tsx"
 
 # Persistent Sheet
 
-A persistent sheet that are displayed above another widget. It is part of [FScaffold](/docs/layout/scaffold), which
-should be preferred in most cases.
-
-A closely related widget is a [modal sheet](/docs/overlay/modal-sheet) which prevents the user from interacting with the
-rest of the app.
+A persistent sheet is displayed above another widget while still allowing users to interact with the widget below.
+It is part of [FScaffold](/docs/layout/scaffold), which should be preferred in most cases.
 
 <LinkBadgeGroup>
     <LinkBadge label="API Reference" href="https://pub.dev/documentation/forui/latest/forui.widgets.sheet/forui.widgets.sheet-library.html"/>
 </LinkBadgeGroup>
 
 <Callout type="info">
+    A closely related widget is a [modal sheet](/docs/overlay/sheet) which prevents the user from interacting with the
+    rest of the app.
+</Callout>
+
+<Callout type="warning">
     All calls to `showFPersistentSheet(...)` should be made inside widgets that have either `FScaffold` or `FSheets` as
     their ancestor.
 </Callout>
@@ -189,7 +191,7 @@ showFPersistentSheet(
     <Widget name='persistent-sheet' query={{keepAliveOffstage: true}} height={500}/>
   </Tabs.Tab>
   <Tabs.Tab>
-    ```dart {17}
+    ```dart {23}
     class Sheets extends StatefulWidget {
       @override
       State<Sheets> createState() => _State();
@@ -334,7 +336,7 @@ showFPersistentSheet(
     <Widget name='persistent-sheet' query={{}} height={400} variant='draggable'/>
   </Tabs.Tab>
   <Tabs.Tab>
-    ```dart
+    ```dart {23-41}
     class DraggableSheets extends StatefulWidget {
       @override
       State<DraggableSheets> createState() => _State();

diff --git a/docs/pages/docs/overlay/modal-sheet.mdx → docs/pages/docs/overlay/sheet.mdx b/docs/pages/docs/overlay/modal-sheet.mdx → docs/pages/docs/overlay/sheet.mdx
@@ -1,19 +1,22 @@
-import { Tabs } from 'nextra/components';
+import { Callout, Tabs } from 'nextra/components';
 import { Widget } from "../../../components/widget.tsx";
 import LinkBadge from "../../../components/link-badge/link-badge.tsx";
 import LinkBadgeGroup from "../../../components/link-badge/link-badge-group.tsx";
 
-# Modal Sheet
+# Sheet
 
 A modal sheet is an alternative to a menu or a dialog and prevents the user from interacting with the rest of the app.
-
-A closely related widget is a [persistent sheet](/docs/overlay/persistent-sheet), which shows information that
-supplements the primary content of the app without preventing the user from interacting with the app.
+It navigates to a new page each time.
 
 <LinkBadgeGroup>
     <LinkBadge label="API Reference" href="https://pub.dev/documentation/forui/latest/forui.widgets.sheet/forui.widgets.sheet-library.html"/>
 </LinkBadgeGroup>
 
+<Callout type="info">
+    A closely related widget is a [persistent sheet](/docs/overlay/persistent-sheet), which shows information that
+    supplements the primary content of the app without preventing the user from interacting with the app.
+</Callout>
+
 <Tabs items={['Preview', 'Code']}>
   <Tabs.Tab>
     <Widget name='modal-sheet' query={{}} height={500}/>
@@ -160,7 +163,7 @@ showFSheet(
     <Widget name='modal-sheet' query={{}} height={400} variant='draggable'/>
   </Tabs.Tab>
   <Tabs.Tab>
-    ```dart
+    ```dart {9-22}
     FButton(
       label: const Text('Click me'),
       onPress: () => showFModalSheet(

diff --git a/forui/lib/src/widgets/sheet/modal_sheet.dart b/forui/lib/src/widgets/sheet/modal_sheet.dart
@@ -33,7 +33,7 @@ import 'package:forui/src/widgets/sheet/sheet.dart';
 /// closed.
 ///
 /// See:
-/// * https://forui.dev/docs/overlay/modal-sheet for working examples.
+/// * https://forui.dev/docs/overlay/sheet for working examples.
 /// * [showFPersistentSheet] for displaying a sheet above the current widget.
 /// * [FModalSheetRoute] for more information about the various arguments.
 /// * [FSheetStyle] for customizing a switch's appearance.
@@ -96,7 +96,7 @@ Future<T?> showFSheet<T>({
 /// app without preventing the user from interacting with the app.
 ///
 /// See:
-/// * https://forui.dev/docs/overlay/modal-sheet for working examples.
+/// * https://forui.dev/docs/overlay/sheet for working examples.
 /// * [FSheetStyle] for customizing a switch's appearance.
 /// * [showFSheet] for displaying a FModalSheetRoute.
 /// * [showFPersistentSheet] for displaying a sheet above the current widget.

diff --git a/forui/lib/src/widgets/sheet/persistent_sheet.dart b/forui/lib/src/widgets/sheet/persistent_sheet.dart
@@ -77,7 +77,7 @@ FPersistentSheetController showFPersistentSheet({
     ]);
   }
 
-  key ??= ValueKey(Random.secure().nextInt(2147483647));
+  key ??= ValueKey(Random().nextInt(2147483647));
   style ??= context.theme.sheetStyle;
 
   final controller = FPersistentSheetController._(

diff --git a/forui/lib/widgets/sheet.dart b/forui/lib/widgets/sheet.dart
@@ -3,7 +3,7 @@
 /// A sheet is a panel that slides in from the edge of a screen.
 ///
 /// See:
-/// * https://forui.dev/docs/overlay/modal-sheet for working examples of a modal sheet.
+/// * https://forui.dev/docs/overlay/sheet for working examples of a modal sheet.
 library forui.widgets.sheet;
 
 export '../src/widgets/sheet/modal_sheet.dart';