From fe856afd75f0ffc34685cace35c4fdd977580f4d Mon Sep 17 00:00:00 2001 From: Ellet Date: Wed, 27 Dec 2023 14:29:10 +0300 Subject: [PATCH] Fix QuillToolbarFontFamilyButton --- example/lib/screens/quill/quill_screen.dart | 9 -- .../buttons/font_size_configurations.dart | 3 +- ..._style_dropdown_button_configurations.dart | 4 + .../toolbar/buttons/font_family_button.dart | 87 +++++++++---------- .../toolbar/buttons/font_size_button.dart | 3 +- lib/src/widgets/toolbar/simple_toolbar.dart | 1 - 6 files changed, 50 insertions(+), 57 deletions(-) diff --git a/example/lib/screens/quill/quill_screen.dart b/example/lib/screens/quill/quill_screen.dart index 40d78a96..5982efe6 100644 --- a/example/lib/screens/quill/quill_screen.dart +++ b/example/lib/screens/quill/quill_screen.dart @@ -107,15 +107,6 @@ class _QuillScreenState extends State { }, child: const Text('Print as PDF'), ), - MenuItemButton( - child: const Text('Convert to markdown'), - onPressed: () { - final delta = _controller.document.toDelta(); - // final content = DeltaToMarkdown().convert(delta); - print('H'); - context.messenger.showText('Printted to log'); - }, - ), ], ), IconButton( diff --git a/lib/src/models/config/toolbar/buttons/font_size_configurations.dart b/lib/src/models/config/toolbar/buttons/font_size_configurations.dart index e1f5590c..3fcf373c 100644 --- a/lib/src/models/config/toolbar/buttons/font_size_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/font_size_configurations.dart @@ -42,7 +42,7 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, this.padding, this.style, - this.width, + @Deprecated('No longer used') this.width, this.initialValue, this.labelOverflow = TextOverflow.visible, this.itemHeight, @@ -106,6 +106,7 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< attribute: attribute ?? this.attribute, padding: padding ?? this.padding, style: style ?? this.style, + // ignore: deprecated_member_use_from_same_package width: width ?? this.width, initialValue: initialValue ?? this.initialValue, labelOverflow: labelOverflow ?? this.labelOverflow, diff --git a/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart b/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart index d163435d..6bf73db4 100644 --- a/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart @@ -31,6 +31,7 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions super.iconData, this.attributes, this.defaultDisplayText, + this.width, }); /// By default we will the toolbar axis from [QuillSimpleToolbarConfigurations] @@ -51,6 +52,7 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions /// ] /// ``` final List>? attributes; + final double? width; final String? defaultDisplayText; @@ -65,6 +67,7 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions String? tooltip, QuillIconTheme? iconTheme, String? defaultDisplayText, + double? width, }) { return QuillToolbarSelectHeaderStyleDropdownButtonOptions( attributes: attributes ?? this.attributes, @@ -75,6 +78,7 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions iconSize: iconSize ?? this.iconSize, iconButtonFactor: iconButtonFactor ?? this.iconButtonFactor, defaultDisplayText: defaultDisplayText ?? this.defaultDisplayText, + width: width ?? this.width, ); } } diff --git a/lib/src/widgets/toolbar/buttons/font_family_button.dart b/lib/src/widgets/toolbar/buttons/font_family_button.dart index 3b1065b6..276b7391 100644 --- a/lib/src/widgets/toolbar/buttons/font_family_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_family_button.dart @@ -11,7 +11,8 @@ import '../base_toolbar.dart'; class QuillToolbarFontFamilyButton extends StatefulWidget { QuillToolbarFontFamilyButton({ required this.controller, - required this.defaultDisplayText, + @Deprecated('Please use the default display text from the options') + this.defaultDisplayText, this.options = const QuillToolbarFontFamilyButtonOptions(), super.key, }) : assert(options.rawItemsMap?.isNotEmpty ?? (true)), @@ -21,8 +22,7 @@ class QuillToolbarFontFamilyButton extends StatefulWidget { final QuillToolbarFontFamilyButtonOptions options; - @Deprecated('Please use the default display text from the options') - final String defaultDisplayText; + final String? defaultDisplayText; /// Since we can't get the state from the instace of the widget for comparing /// in [didUpdateWidget] then we will have to store reference here @@ -50,10 +50,15 @@ class QuillToolbarFontFamilyButtonState } void _initState() { - _currentValue = _defaultDisplayText; // controller.addListener(_didChangeEditingValue); } + @override + void didChangeDependencies() { + super.didChangeDependencies(); + _currentValue = _defaultDisplayText; + } + // @override // void dispose() { // controller.removeListener(_didChangeEditingValue); @@ -63,8 +68,8 @@ class QuillToolbarFontFamilyButtonState String get _defaultDisplayText { return options.initialValue ?? widget.options.defaultDisplayText ?? - // ignore: deprecated_member_use_from_same_package - widget.defaultDisplayText; + widget.defaultDisplayText ?? + context.loc.font; } // @override @@ -169,46 +174,40 @@ class QuillToolbarFontFamilyButtonState ), ); } - return ConstrainedBox( - constraints: BoxConstraints.tightFor( - height: iconSize * 1.81, - width: options.width, - ), - child: UtilityWidgets.maybeWidget( - enabled: tooltip.isNotEmpty || options.overrideTooltipByFontFamily, - wrapper: (child) { - var effectiveTooltip = tooltip; - if (options.overrideTooltipByFontFamily) { - effectiveTooltip = effectiveTooltip.isNotEmpty - ? '$effectiveTooltip: $_currentValue' - : '${context.loc.font}: $_currentValue'; - } - return Tooltip(message: effectiveTooltip, child: child); - }, - child: Builder( - builder: (context) { - final isMaterial3 = Theme.of(context).useMaterial3; - if (!isMaterial3) { - return RawMaterialButton( - onPressed: _onPressed, - child: _buildContent(context), - ); - } - return QuillToolbarIconButton( - isSelected: false, - iconTheme: iconTheme?.copyWith( - iconButtonSelectedData: const IconButtonData( - visualDensity: VisualDensity.compact, - ), - iconButtonUnselectedData: const IconButtonData( - visualDensity: VisualDensity.compact, - ), - ), + return UtilityWidgets.maybeWidget( + enabled: tooltip.isNotEmpty || options.overrideTooltipByFontFamily, + wrapper: (child) { + var effectiveTooltip = tooltip; + if (options.overrideTooltipByFontFamily) { + effectiveTooltip = effectiveTooltip.isNotEmpty + ? '$effectiveTooltip: $_currentValue' + : '${context.loc.font}: $_currentValue'; + } + return Tooltip(message: effectiveTooltip, child: child); + }, + child: Builder( + builder: (context) { + final isMaterial3 = Theme.of(context).useMaterial3; + if (!isMaterial3) { + return RawMaterialButton( onPressed: _onPressed, - icon: _buildContent(context), + child: _buildContent(context), ); - }, - ), + } + return QuillToolbarIconButton( + isSelected: false, + iconTheme: iconTheme?.copyWith( + iconButtonSelectedData: const IconButtonData( + visualDensity: VisualDensity.compact, + ), + iconButtonUnselectedData: const IconButtonData( + visualDensity: VisualDensity.compact, + ), + ), + onPressed: _onPressed, + icon: _buildContent(context), + ); + }, ), ); } diff --git a/lib/src/widgets/toolbar/buttons/font_size_button.dart b/lib/src/widgets/toolbar/buttons/font_size_button.dart index 3d7948c4..92f7072d 100644 --- a/lib/src/widgets/toolbar/buttons/font_size_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_size_button.dart @@ -13,6 +13,7 @@ import '../base_toolbar.dart'; class QuillToolbarFontSizeButton extends StatefulWidget { QuillToolbarFontSizeButton({ required this.controller, + @Deprecated('Please use the default display text from the options') this.defaultDisplayText, this.options = const QuillToolbarFontSizeButtonOptions(), super.key, @@ -22,7 +23,6 @@ class QuillToolbarFontSizeButton extends StatefulWidget { final QuillToolbarFontSizeButtonOptions options; - @Deprecated('Please use the default display text from the options') final String? defaultDisplayText; /// Since we can't get the state from the instace of the widget for comparing @@ -68,7 +68,6 @@ class QuillToolbarFontSizeButtonState String get _defaultDisplayText { return options.initialValue ?? widget.options.defaultDisplayText ?? - // ignore: deprecated_member_use_from_same_package widget.defaultDisplayText ?? context.loc.fontSize; } diff --git a/lib/src/widgets/toolbar/simple_toolbar.dart b/lib/src/widgets/toolbar/simple_toolbar.dart index 9fa53093..998b0970 100644 --- a/lib/src/widgets/toolbar/simple_toolbar.dart +++ b/lib/src/widgets/toolbar/simple_toolbar.dart @@ -77,7 +77,6 @@ class QuillSimpleToolbar extends StatelessWidget QuillToolbarFontFamilyButton( options: toolbarConfigurations.buttonOptions.fontFamily, controller: globalController, - defaultDisplayText: context.loc.font, ), if (configurations.showFontSize) QuillToolbarFontSizeButton(