From 9d0cd819299d7acfe0a2c7b53b4e75b7e37c3eea Mon Sep 17 00:00:00 2001 From: Thanh Dat Vo Date: Thu, 17 Apr 2025 17:48:48 -0700 Subject: [PATCH 1/5] Update default_styles.dart --- lib/src/editor/widgets/default_styles.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/editor/widgets/default_styles.dart b/lib/src/editor/widgets/default_styles.dart index a0f1b084e..32532d34e 100644 --- a/lib/src/editor/widgets/default_styles.dart +++ b/lib/src/editor/widgets/default_styles.dart @@ -250,9 +250,9 @@ class DefaultStyles { final themeData = Theme.of(context); final defaultTextStyle = DefaultTextStyle.of(context); final baseStyle = defaultTextStyle.style.copyWith( - fontSize: 16, - height: 1.15, - decoration: TextDecoration.none, + // fontSize: 16, + // height: 1.15, + // decoration: TextDecoration.none, ); const baseHorizontalSpacing = HorizontalSpacing(0, 0); const baseVerticalSpacing = VerticalSpacing(6, 0); From 5c0ed36ea82efe31dc95ae6a05acc231e6d3ca83 Mon Sep 17 00:00:00 2001 From: Thanh Dat Vo Date: Thu, 17 Apr 2025 18:02:47 -0700 Subject: [PATCH 2/5] Update default_styles.dart --- lib/src/editor/widgets/default_styles.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/editor/widgets/default_styles.dart b/lib/src/editor/widgets/default_styles.dart index 32532d34e..9a4b0b3cb 100644 --- a/lib/src/editor/widgets/default_styles.dart +++ b/lib/src/editor/widgets/default_styles.dart @@ -439,7 +439,7 @@ class DefaultStyles { null, ), quote: DefaultTextBlockStyle( - TextStyle(color: baseStyle.color!.withValues(alpha: 0.6)), + baseStyle, baseHorizontalSpacing, baseVerticalSpacing, const VerticalSpacing(6, 2), From 70457652cb2e2f4feac19bb96fb2de96cf4e2a6d Mon Sep 17 00:00:00 2001 From: Thanh Dat Vo Date: Thu, 17 Apr 2025 18:53:34 -0700 Subject: [PATCH 3/5] Update default_styles.dart --- lib/src/editor/widgets/default_styles.dart | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/src/editor/widgets/default_styles.dart b/lib/src/editor/widgets/default_styles.dart index 9a4b0b3cb..3a71606bf 100644 --- a/lib/src/editor/widgets/default_styles.dart +++ b/lib/src/editor/widgets/default_styles.dart @@ -249,10 +249,13 @@ class DefaultStyles { static DefaultStyles getInstance(BuildContext context) { final themeData = Theme.of(context); final defaultTextStyle = DefaultTextStyle.of(context); - final baseStyle = defaultTextStyle.style.copyWith( - // fontSize: 16, - // height: 1.15, - // decoration: TextDecoration.none, + final baseStyle = TextStyle( + fontSize: 16, + height: 1.15, + decoration: TextDecoration.none, + ), + ).merge( + defaultTextStyle.style ); const baseHorizontalSpacing = HorizontalSpacing(0, 0); const baseVerticalSpacing = VerticalSpacing(6, 0); @@ -439,7 +442,7 @@ class DefaultStyles { null, ), quote: DefaultTextBlockStyle( - baseStyle, + TextStyle(color: baseStyle.color!.withValues(alpha: 0.6) baseHorizontalSpacing, baseVerticalSpacing, const VerticalSpacing(6, 2), From 4367e04878f5453c8966258769d0d6d52f90fc0e Mon Sep 17 00:00:00 2001 From: Thanh Dat Vo Date: Thu, 17 Apr 2025 18:54:36 -0700 Subject: [PATCH 4/5] Update default_styles.dart --- lib/src/editor/widgets/default_styles.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/editor/widgets/default_styles.dart b/lib/src/editor/widgets/default_styles.dart index 3a71606bf..39d894401 100644 --- a/lib/src/editor/widgets/default_styles.dart +++ b/lib/src/editor/widgets/default_styles.dart @@ -442,7 +442,7 @@ class DefaultStyles { null, ), quote: DefaultTextBlockStyle( - TextStyle(color: baseStyle.color!.withValues(alpha: 0.6) + TextStyle(color: baseStyle.color!.withValues(alpha: 0.6)), baseHorizontalSpacing, baseVerticalSpacing, const VerticalSpacing(6, 2), From e8d3d75918a8d5891300cd8c15ff263514d395f5 Mon Sep 17 00:00:00 2001 From: Thanh Dat Vo Date: Thu, 17 Apr 2025 19:01:31 -0700 Subject: [PATCH 5/5] Update default_styles.dart --- lib/src/editor/widgets/default_styles.dart | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/src/editor/widgets/default_styles.dart b/lib/src/editor/widgets/default_styles.dart index 39d894401..0d3c8f1d2 100644 --- a/lib/src/editor/widgets/default_styles.dart +++ b/lib/src/editor/widgets/default_styles.dart @@ -250,13 +250,10 @@ class DefaultStyles { final themeData = Theme.of(context); final defaultTextStyle = DefaultTextStyle.of(context); final baseStyle = TextStyle( - fontSize: 16, - height: 1.15, - decoration: TextDecoration.none, - ), - ).merge( - defaultTextStyle.style - ); + fontSize: 16, + height: 1.15, + decoration: TextDecoration.none, + ).merge(defaultTextStyle.style); const baseHorizontalSpacing = HorizontalSpacing(0, 0); const baseVerticalSpacing = VerticalSpacing(6, 0); final fontFamily = themeData.isCupertino ? 'Menlo' : 'Roboto Mono';