Merge `customShorcuts` and `customActions`

pull/1185/head
bambinoua 2 years ago
parent ec8e05b083
commit d3fc816910
  1. 14
      lib/src/widgets/raw_editor.dart

@ -4,6 +4,7 @@ import 'dart:io';
import 'dart:math' as math; import 'dart:math' as math;
import 'dart:ui' as ui hide TextStyle; import 'dart:ui' as ui hide TextStyle;
import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
@ -515,7 +516,7 @@ class RawEditorState extends EditorState
child: QuillStyles( child: QuillStyles(
data: _styles!, data: _styles!,
child: Shortcuts( child: Shortcuts(
shortcuts: <ShortcutActivator, Intent>{ shortcuts: mergeMaps<ShortcutActivator, Intent>({
// shortcuts added for Desktop platforms. // shortcuts added for Desktop platforms.
const SingleActivator( const SingleActivator(
LogicalKeyboardKey.escape, LogicalKeyboardKey.escape,
@ -642,14 +643,13 @@ class RawEditorState extends EditorState
control: !isMacOS, control: !isMacOS,
meta: isMacOS, meta: isMacOS,
): const OpenSearchIntent(), ): const OpenSearchIntent(),
}, {
...?widget.customShortcuts, ...?widget.customShortcuts
}, }),
child: Actions( child: Actions(
actions: { actions: mergeMaps<Type, Action<Intent>>(_actions, {
..._actions,
...?widget.customActions, ...?widget.customActions,
}, }),
child: Focus( child: Focus(
focusNode: widget.focusNode, focusNode: widget.focusNode,
onKey: _onKey, onKey: _onKey,

Loading…
Cancel
Save