From 7f1a6e7c4ed6ecb8b95fc5fa4ff51a6497b44af4 Mon Sep 17 00:00:00 2001 From: "daniel.trotter" Date: Thu, 9 Feb 2023 15:56:03 -0600 Subject: [PATCH] bug fix build error --- lib/src/widgets/raw_editor.dart | 18 ------------------ lib/src/widgets/text_selection.dart | 8 +++++--- .../toolbar/quill_font_family_button.dart | 3 ++- .../toolbar/quill_font_size_button.dart | 3 ++- pubspec.yaml | 2 +- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart index e5836a14..835f0db8 100644 --- a/lib/src/widgets/raw_editor.dart +++ b/lib/src/widgets/raw_editor.dart @@ -1422,24 +1422,6 @@ class RawEditorState extends EditorState // this is needed for Scribble (Stylus input) in Apple platforms // and this package does not implement this feature } - - @override - void didChangeInputControl( - TextInputControl? oldControl, TextInputControl? newControl) { - // TODO: implement didChangeInputControl - } - - @override - void performSelector(String selectorName) { - final intent = intentForMacOSSelector(selectorName); - - if (intent != null) { - final primaryContext = primaryFocus?.context; - if (primaryContext != null) { - Actions.invoke(primaryContext, intent); - } - } - } } class _Editor extends MultiChildRenderObjectWidget { diff --git a/lib/src/widgets/text_selection.dart b/lib/src/widgets/text_selection.dart index dd6d6c18..d0636515 100644 --- a/lib/src/widgets/text_selection.dart +++ b/lib/src/widgets/text_selection.dart @@ -4,6 +4,7 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import '../models/documents/nodes/node.dart'; @@ -84,7 +85,8 @@ class EditorTextSelectionOverlay { final overlay = Overlay.of(context, rootOverlay: true); _toolbarController = AnimationController( - duration: const Duration(milliseconds: 150), vsync: overlay); + duration: const Duration(milliseconds: 150), + vsync: overlay as TickerProvider); } TextEditingValue value; @@ -222,7 +224,7 @@ class EditorTextSelectionOverlay { assert(toolbar == null); toolbar = OverlayEntry(builder: _buildToolbar); Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor) - .insert(toolbar!); + ?.insert(toolbar!); _toolbarController.forward(from: 0); // make sure handles are visible as well @@ -407,7 +409,7 @@ class EditorTextSelectionOverlay { ]; Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor) - .insertAll(_handles!); + ?.insertAll(_handles!); } /// Causes the overlay to update its rendering. diff --git a/lib/src/widgets/toolbar/quill_font_family_button.dart b/lib/src/widgets/toolbar/quill_font_family_button.dart index 88b3dda4..3ffcb057 100644 --- a/lib/src/widgets/toolbar/quill_font_family_button.dart +++ b/lib/src/widgets/toolbar/quill_font_family_button.dart @@ -109,7 +109,8 @@ class _QuillFontFamilyButtonState extends State { void _showMenu() { final popupMenuTheme = PopupMenuTheme.of(context); final button = context.findRenderObject() as RenderBox; - final overlay = Overlay.of(context).context.findRenderObject() as RenderBox; + final overlay = + Overlay.of(context)?.context.findRenderObject() as RenderBox; final position = RelativeRect.fromRect( Rect.fromPoints( button.localToGlobal(Offset.zero, ancestor: overlay), diff --git a/lib/src/widgets/toolbar/quill_font_size_button.dart b/lib/src/widgets/toolbar/quill_font_size_button.dart index da6fa187..bfb49117 100644 --- a/lib/src/widgets/toolbar/quill_font_size_button.dart +++ b/lib/src/widgets/toolbar/quill_font_size_button.dart @@ -110,7 +110,8 @@ class _QuillFontSizeButtonState extends State { void _showMenu() { final popupMenuTheme = PopupMenuTheme.of(context); final button = context.findRenderObject() as RenderBox; - final overlay = Overlay.of(context).context.findRenderObject() as RenderBox; + final overlay = + Overlay.of(context)?.context.findRenderObject() as RenderBox; final position = RelativeRect.fromRect( Rect.fromPoints( button.localToGlobal(Offset.zero, ancestor: overlay), diff --git a/pubspec.yaml b/pubspec.yaml index 5e1787b9..cff0732e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: pedantic: ^1.11.1 characters: ^1.2.0 diff_match_patch: ^0.4.1 - i18n_extension: ^6.0.0 + i18n_extension: device_info_plus: ^8.0.0 platform: ^3.1.0 pasteboard: ^0.2.0