From 95359f66b5690d3d300c69f90394447d9620ed29 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 21 May 2021 22:48:25 +0100 Subject: [PATCH] Fixes for flutter web (#234) * Fix for Attribute object comparison * Fix for "Unexpected null value" error on web Clipboard is now supported on web, via a permission request through the browser Co-authored-by: George Johnson --- lib/src/models/documents/attribute.dart | 2 +- lib/src/widgets/raw_editor.dart | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/models/documents/attribute.dart b/lib/src/models/documents/attribute.dart index 1b9043b9..acd979cb 100644 --- a/lib/src/models/documents/attribute.dart +++ b/lib/src/models/documents/attribute.dart @@ -193,7 +193,7 @@ class Attribute { @override bool operator ==(Object other) { if (identical(this, other)) return true; - if (other is! Attribute) return false; + if (other is! Attribute) return false; final typedOther = other; return key == typedOther.key && scope == typedOther.scope && diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart index cd4f379c..e52e18cd 100644 --- a/lib/src/widgets/raw_editor.dart +++ b/lib/src/widgets/raw_editor.dart @@ -126,8 +126,7 @@ class RawEditorState extends EditorState DefaultStyles? _styles; - final ClipboardStatusNotifier? _clipboardStatus = - kIsWeb ? null : ClipboardStatusNotifier(); + final ClipboardStatusNotifier _clipboardStatus = ClipboardStatusNotifier(); final LayerLink _toolbarLayerLink = LayerLink(); final LayerLink _startHandleLayerLink = LayerLink(); final LayerLink _endHandleLayerLink = LayerLink(); @@ -318,7 +317,7 @@ class RawEditorState extends EditorState void initState() { super.initState(); - _clipboardStatus?.addListener(_onChangedClipboardStatus); + _clipboardStatus.addListener(_onChangedClipboardStatus); widget.controller.addListener(() { _didChangeTextEditingValue(widget.controller.ignoreFocusOnTextChange); @@ -438,8 +437,9 @@ class RawEditorState extends EditorState widget.focusNode.removeListener(_handleFocusChanged); _focusAttachment!.detach(); _cursorCont.dispose(); - _clipboardStatus?.removeListener(_onChangedClipboardStatus); - _clipboardStatus?.dispose(); + _clipboardStatus + ..removeListener(_onChangedClipboardStatus) + ..dispose(); super.dispose(); } @@ -518,7 +518,7 @@ class RawEditorState extends EditorState this, DragStartBehavior.start, null, - _clipboardStatus!, + _clipboardStatus, ); _selectionOverlay!.handlesVisible = _shouldShowSelectionHandles(); _selectionOverlay!.showHandles();