Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable interacting with Widgets in Floating Overlay #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ void main() {

class App extends StatelessWidget {
const App({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
// Create one of this and pass it to the FloatingOverlay, to be able to pop
Expand All @@ -23,7 +24,7 @@ class App extends StatelessWidget {
primarySwatch: Colors.blue,
),
home: Provider<RouteObserver>(
// One way to make it avaliable through all your files and pages, but
// One way to make it available through all your files and pages, but
// global variables and other means will work just fine as well.
create: (_) => routeObserver,
child: const HomePage(),
Expand Down Expand Up @@ -53,6 +54,10 @@ class HomePage extends StatelessWidget {
// Passing the RouteObserver created at line 17 as a parameter, will
// make so that when you push pages on top of this one, the floating
// child will vanish and reappear when you return.

// In order to work with Web refresh a UniqueKey needs to be provided otherwise Overlay in State in the FloatingState is not refreshed
key: UniqueKey(),
// If a UniqueKey is passed the routeObserver no longer works though
routeObserver: routeObserver,
controller: controller,
floatingChild: SizedBox.square(
Expand All @@ -65,6 +70,19 @@ class HomePage extends StatelessWidget {
width: 5.0,
),
),
child: Material(
child: Container(
height: 5,
padding: const EdgeInsets.all(10),
child: const TextField(
decoration: InputDecoration(
border: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(5)),
),
),
),
),
),
),
),
child: Center(
Expand Down Expand Up @@ -166,8 +184,7 @@ class AnimationPage extends StatefulWidget {
_AnimationPageState createState() => _AnimationPageState();
}

class _AnimationPageState extends State<AnimationPage>
with SingleTickerProviderStateMixin {
class _AnimationPageState extends State<AnimationPage> with SingleTickerProviderStateMixin {
late final AnimationController animationController;
late final FloatingOverlayController controller;

Expand Down
135 changes: 80 additions & 55 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,72 +5,73 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev"
source: hosted
version: "2.8.2"
version: "2.10.0"
bloc:
dependency: transitive
description:
name: bloc
url: "https://pub.dartlang.org"
sha256: "6f1b87b6eca9041d5672b6e29273cd1594db48ebb66fd2471066e9f3c3a516bd"
url: "https://pub.dev"
source: hosted
version: "7.2.1"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.17.0"
equatable:
dependency: transitive
description:
name: equatable
url: "https://pub.dartlang.org"
sha256: c6094fd1efad3046334a9c40bee022147e55c25401ccd89b94e373e3edadd375
url: "https://pub.dev"
source: hosted
version: "2.0.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.1"
floating_overlay:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.2.0"
version: "1.2.1"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -80,61 +81,85 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
url: "https://pub.dartlang.org"
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
url: "https://pub.dev"
source: hosted
version: "1.0.4"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
lints:
dependency: transitive
description:
name: lints
url: "https://pub.dartlang.org"
sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
url: "https://pub.dev"
source: hosted
version: "1.0.1"
logging:
dependency: transitive
description:
name: logging
url: "https://pub.dartlang.org"
sha256: "293ae2d49fd79d4c04944c3a26dfd313382d5f52e821ec57119230ae16031ad4"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev"
source: hosted
version: "0.12.11"
version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev"
source: hosted
version: "1.7.0"
version: "1.8.0"
nested:
dependency: transitive
description:
name: nested
url: "https://pub.dartlang.org"
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.8.2"
provider:
dependency: "direct main"
description:
name: provider
url: "https://pub.dartlang.org"
sha256: dc18c7bddb94a1eb3c3154587d16175a657356c80566712e6cd8ca4825eae112
url: "https://pub.dev"
source: hosted
version: "6.0.1"
sky_engine:
Expand All @@ -146,58 +171,58 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.8.1"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.4"
sdks:
dart: ">=2.14.0 <3.0.0"
dart: ">=2.18.0 <3.0.0"
flutter: ">=1.17.0"
12 changes: 9 additions & 3 deletions lib/src/floating_overlay_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class FloatingOverlayController extends Cubit<FloatingOverlayData> {
GlobalKey _key = GlobalKey();
OverlayState? _overlay;
OverlayEntry? _entry;
_Reposition? _reposition;
Widget? _child;

void _initState(
Expand Down Expand Up @@ -224,14 +225,18 @@ class FloatingOverlayController extends Cubit<FloatingOverlayData> {
_logger.info('Showing entry');
_entry = OverlayEntry(
builder: (context) {
return _entryProcesWidgets;
return _entryProcessWidgets;
},
);
_overlay?.insert(_entry!);
}

Widget get _entryProcesWidgets {
return _Reposition(
Widget get _entryProcessWidgets {
if (_reposition != null) {
return _reposition!;
}

_reposition = _Reposition(
offsetController: _offset,
child: Stack(
children: [
Expand Down Expand Up @@ -291,6 +296,7 @@ class FloatingOverlayController extends Cubit<FloatingOverlayData> {
],
),
);
return _reposition!;
}

Widget get gestureDetector {
Expand Down
Loading