improved tab handling by id

This commit is contained in:
Fabian Freund
2024-08-19 04:27:47 +02:00
parent a465195ec4
commit 23dad27d61
12 changed files with 78 additions and 40 deletions
@@ -0,0 +1,10 @@
import 'package:drift/drift.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
abstract interface class ITab {
String get id;
Uri get url;
String? get title;
Favicon? get favicon;
Uint8List? get screenshot;
}
@@ -3,25 +3,35 @@ import 'package:fast_equatable/fast_equatable.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:lensai/core/uuid.dart';
import 'package:lensai/domain/entities/web_page_info.dart';
import 'package:lensai/features/web_view/domain/entities/abstract/tab.dart';
part 'web_view_page.g.dart';
typedef PageHistory = ({bool canGoBack, bool canGoForward});
@CopyWith(constructor: '_')
class WebViewPage extends WebPageInfo with FastEquatable {
class WebViewPage extends WebPageInfo with FastEquatable implements ITab {
@CopyWithField(immutable: true)
final Key key;
@override
@CopyWithField(immutable: true)
final String id;
final InAppWebViewController? controller;
// ignore: missing_field_in_equatable_props
final SslError? sslError;
@override
final Uint8List? screenshot;
final PageHistory pageHistory;
WebViewPage({
String? id,
this.controller,
required super.url,
this.sslError,
@@ -29,10 +39,12 @@ class WebViewPage extends WebPageInfo with FastEquatable {
super.favicon,
this.screenshot,
this.pageHistory = (canGoBack: false, canGoForward: false),
}) : key = GlobalKey();
}) : key = GlobalKey(),
id = id ?? uuid.v7();
WebViewPage._({
required this.key,
required this.id,
required this.controller,
required super.url,
required this.sslError,
@@ -48,8 +60,9 @@ class WebViewPage extends WebPageInfo with FastEquatable {
@override
List<Object?> get hashParameters => [
key,
id,
controller,
url,
super.url,
sslError?.toString(),
title,
favicon?.toString(),
@@ -86,6 +86,7 @@ class _$WebViewPageCWProxyImpl implements _$WebViewPageCWProxy {
}) {
return WebViewPage._(
key: _value.key,
id: _value.id,
controller: controller == const $CopyWithPlaceholder()
? _value.controller
// ignore: cast_nullable_to_non_nullable
@@ -8,35 +8,34 @@ part 'web_view.g.dart';
@Riverpod(keepAlive: true)
class WebViewTabController extends _$WebViewTabController {
late Map<Key, WebView> _webViewTabs;
late Map<String, WebView> _webViewTabs;
@override
WebView? build() {
_webViewTabs = ref.watch(webViewRepositoryProvider);
return (stateOrNull != null)
? _webViewTabs[stateOrNull!.page.value.key] ??
_webViewTabs.values.lastOrNull
? _webViewTabs[stateOrNull!.tabId] ?? _webViewTabs.values.lastOrNull
: null;
}
void showTab(Key? key) {
state = (key != null) ? _webViewTabs[key] : null;
void showTab(String? id) {
state = (id != null) ? _webViewTabs[id] : null;
}
}
@Riverpod(keepAlive: true)
class WebViewRepository extends _$WebViewRepository {
@override
Map<Key, WebView> build() {
Map<String, WebView> build() {
return stateOrNull ?? {};
}
void addTab(WebView webView) {
state = {...state, webView.page.value.key: webView};
state = {...state, webView.tabId: webView};
}
void closeTab(Key key) {
state = Map.of(state)..remove(key);
void closeTab(String id) {
state = Map.of(state)..remove(id);
}
void closeAllTabs() {
@@ -7,7 +7,7 @@ part of 'web_view.dart';
// **************************************************************************
String _$webViewTabControllerHash() =>
r'45eaa10e6032b04717e8ba08b8dce8ed22764f46';
r'3f1d7460295c6399382881ee56c4ed7f1fd5fe03';
/// See also [WebViewTabController].
@ProviderFor(WebViewTabController)
@@ -23,12 +23,12 @@ final webViewTabControllerProvider =
);
typedef _$WebViewTabController = Notifier<WebView?>;
String _$webViewRepositoryHash() => r'6732fd1b8a465073b599f64d6710a61cd605c779';
String _$webViewRepositoryHash() => r'dae5e1527ab4ad27f6a882fb63d8e88cd812b20b';
/// See also [WebViewRepository].
@ProviderFor(WebViewRepository)
final webViewRepositoryProvider =
NotifierProvider<WebViewRepository, Map<Key, WebView>>.internal(
NotifierProvider<WebViewRepository, Map<String, WebView>>.internal(
WebViewRepository.new,
name: r'webViewRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -38,6 +38,6 @@ final webViewRepositoryProvider =
allTransitiveDependencies: null,
);
typedef _$WebViewRepository = Notifier<Map<Key, WebView>>;
typedef _$WebViewRepository = Notifier<Map<String, WebView>>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member