fix: FontFamily and FontSize toolbars track the text selected in the editor. (#1829)
* toggle_style_button : calls to options.afterButtonPressed replaced by call to class function afterButtonPressed to allow default call to base button settings quill_icon_button: L26 build for isSelected updated to call afterButtonPressed = same as if not selected QuillController _updateSelection removed param=source because not used; added new param insertNewline when true set tog to style of preceding char (last entered); updated replaceText to call _updateSelection for NL document collectStyle: Selecting the start of a line, user expects the style to be the visible style of the line including inline styles * color_button calls afterButtonPressed insert at start of line uses style for line * Remove comments * Fix formatting issue * Fix FontFamily and Size button actions * Fix FontFamily and Size button actions * Value setting Stateful toolbar buttons derive from base class * Rename base class as QuillToolbarBaseValueButton * Fixes for before_push script * Removed deprecated functions --------- Co-authored-by: Douglas Ward <dward@scied.com>pull/1855/head
AtlasAutocode
11 months ago
committed by
GitHub
parent
9044e2ad49
commit
08d2a2e4f2
7 changed files with 184 additions and 360 deletions
@ -0,0 +1,98 @@ |
||||
import 'package:flutter/material.dart'; |
||||
|
||||
import '../../../../flutter_quill.dart'; |
||||
|
||||
/// The [T] is the options for the button |
||||
/// The [E] is the extra options for the button |
||||
abstract class QuillToolbarBaseValueButton< |
||||
T extends QuillToolbarBaseButtonOptions<T, E>, |
||||
E extends QuillToolbarBaseButtonExtraOptions> extends StatefulWidget { |
||||
const QuillToolbarBaseValueButton( |
||||
{required this.controller, required this.options, super.key}); |
||||
|
||||
final T options; |
||||
|
||||
final QuillController controller; |
||||
} |
||||
|
||||
/// The [W] is the widget that creates this State |
||||
/// The [V] is the type of the currentValue |
||||
abstract class QuillToolbarBaseValueButtonState< |
||||
W extends QuillToolbarBaseValueButton<T, E>, |
||||
T extends QuillToolbarBaseButtonOptions<T, E>, |
||||
E extends QuillToolbarBaseButtonExtraOptions, |
||||
V> extends State<W> { |
||||
T get options => widget.options; |
||||
|
||||
QuillController get controller => widget.controller; |
||||
|
||||
late V currentValue; |
||||
|
||||
/// Callback to query the widget's state for the value to be assigned to currentState |
||||
V get currentStateValue; |
||||
|
||||
@override |
||||
void initState() { |
||||
super.initState(); |
||||
controller.addListener(didChangeEditingValue); |
||||
} |
||||
|
||||
@override |
||||
void didChangeDependencies() { |
||||
super.didChangeDependencies(); |
||||
currentValue = currentStateValue; |
||||
} |
||||
|
||||
void didChangeEditingValue() { |
||||
setState(() => currentValue = currentStateValue); |
||||
} |
||||
|
||||
@override |
||||
void dispose() { |
||||
controller.removeListener(didChangeEditingValue); |
||||
super.dispose(); |
||||
} |
||||
|
||||
@override |
||||
void didUpdateWidget(covariant W oldWidget) { |
||||
super.didUpdateWidget(oldWidget); |
||||
if (oldWidget.controller != controller) { |
||||
oldWidget.controller.removeListener(didChangeEditingValue); |
||||
controller.addListener(didChangeEditingValue); |
||||
currentValue = currentStateValue; |
||||
} |
||||
} |
||||
|
||||
String get defaultTooltip; |
||||
|
||||
String get tooltip { |
||||
return options.tooltip ?? |
||||
context.quillToolbarBaseButtonOptions?.tooltip ?? |
||||
defaultTooltip; |
||||
} |
||||
|
||||
double get iconSize { |
||||
final baseFontSize = baseButtonExtraOptions?.iconSize; |
||||
final iconSize = options.iconSize; |
||||
return iconSize ?? baseFontSize ?? kDefaultIconSize; |
||||
} |
||||
|
||||
double get iconButtonFactor { |
||||
final baseIconFactor = baseButtonExtraOptions?.iconButtonFactor; |
||||
final iconButtonFactor = options.iconButtonFactor; |
||||
return iconButtonFactor ?? baseIconFactor ?? kDefaultIconButtonFactor; |
||||
} |
||||
|
||||
QuillIconTheme? get iconTheme { |
||||
return options.iconTheme ?? baseButtonExtraOptions?.iconTheme; |
||||
} |
||||
|
||||
QuillToolbarBaseButtonOptions? get baseButtonExtraOptions { |
||||
return context.quillToolbarBaseButtonOptions; |
||||
} |
||||
|
||||
VoidCallback? get afterButtonPressed { |
||||
return options.afterButtonPressed ?? |
||||
baseButtonExtraOptions?.afterButtonPressed; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue