Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
3efc517a
Unverified
Commit
3efc517a
authored
Jun 12, 2020
by
MH Johnson
Committed by
GitHub
Jun 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Widgets] Add DefaultTextHeightBehavior inherited widget. (#59196)
parent
64f42c0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
193 additions
and
1 deletion
+193
-1
text.dart
packages/flutter/lib/src/widgets/text.dart
+61
-1
default_text_height_behavior_test.dart
...utter/test/widgets/default_text_height_behavior_test.dart
+132
-0
No files found.
packages/flutter/lib/src/widgets/text.dart
View file @
3efc517a
...
@@ -203,6 +203,66 @@ class DefaultTextStyle extends InheritedTheme {
...
@@ -203,6 +203,66 @@ class DefaultTextStyle extends InheritedTheme {
}
}
}
}
/// The [TextHeightBehavior] that will apply to descendant [Text] widgets which
/// have not explicitly set [Text.textHeightBehavior].
///
/// If there is a [DefaultTextStyle] with a non-null [DefaultTextStyle.textHeightBehavior]
/// below this widget, the [DefaultTextStyle.textHeightBehavior] will be used
/// over this widget's [TextHeightBehavior].
///
/// See also:
///
/// * [DefaultTextStyle], which defines a [TextStyle] to apply to descendant
/// [Text] widgets.
class
DefaultTextHeightBehavior
extends
InheritedTheme
{
/// Creates a default text height behavior for the given subtree.
///
/// The [textHeightBehavior] and [child] arguments are required and must not be null.
const
DefaultTextHeightBehavior
({
Key
key
,
@required
this
.
textHeightBehavior
,
@required
Widget
child
,
})
:
assert
(
textHeightBehavior
!=
null
),
assert
(
child
!=
null
),
super
(
key:
key
,
child:
child
);
/// {@macro flutter.dart:ui.textHeightBehavior}
final
TextHeightBehavior
textHeightBehavior
;
/// The closest instance of this class that encloses the given context.
///
/// If no such instance exists, this method will return `null`.
///
/// Typical usage is as follows:
///
/// ```dart
/// DefaultTextHeightBehavior defaultTextHeightBehavior = DefaultTextHeightBehavior.of(context);
/// ```
static
TextHeightBehavior
of
(
BuildContext
context
)
{
return
context
.
dependOnInheritedWidgetOfExactType
<
DefaultTextHeightBehavior
>()?.
textHeightBehavior
;
}
@override
bool
updateShouldNotify
(
DefaultTextHeightBehavior
oldWidget
)
{
return
textHeightBehavior
!=
oldWidget
.
textHeightBehavior
;
}
@override
Widget
wrap
(
BuildContext
context
,
Widget
child
)
{
final
DefaultTextHeightBehavior
defaultTextHeightBehavior
=
context
.
findAncestorWidgetOfExactType
<
DefaultTextHeightBehavior
>();
return
identical
(
this
,
defaultTextHeightBehavior
)
?
child
:
DefaultTextHeightBehavior
(
textHeightBehavior:
textHeightBehavior
,
child:
child
,
);
}
@override
void
debugFillProperties
(
DiagnosticPropertiesBuilder
properties
)
{
super
.
debugFillProperties
(
properties
);
properties
.
add
(
DiagnosticsProperty
<
ui
.
TextHeightBehavior
>(
'textHeightBehavior'
,
textHeightBehavior
,
defaultValue:
null
));
}
}
/// A run of text with a single style.
/// A run of text with a single style.
///
///
/// The [Text] widget displays a string of text with single style. The string
/// The [Text] widget displays a string of text with single style. The string
...
@@ -451,7 +511,7 @@ class Text extends StatelessWidget {
...
@@ -451,7 +511,7 @@ class Text extends StatelessWidget {
maxLines:
maxLines
??
defaultTextStyle
.
maxLines
,
maxLines:
maxLines
??
defaultTextStyle
.
maxLines
,
strutStyle:
strutStyle
,
strutStyle:
strutStyle
,
textWidthBasis:
textWidthBasis
??
defaultTextStyle
.
textWidthBasis
,
textWidthBasis:
textWidthBasis
??
defaultTextStyle
.
textWidthBasis
,
textHeightBehavior:
textHeightBehavior
??
defaultTextStyle
.
textHeightBehavior
,
textHeightBehavior:
textHeightBehavior
??
defaultTextStyle
.
textHeightBehavior
??
DefaultTextHeightBehavior
.
of
(
context
)
,
text:
TextSpan
(
text:
TextSpan
(
style:
effectiveTextStyle
,
style:
effectiveTextStyle
,
text:
data
,
text:
data
,
...
...
packages/flutter/test/widgets/default_text_height_behavior_test.dart
0 → 100644
View file @
3efc517a
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:ui'
show
TextHeightBehavior
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:flutter/widgets.dart'
;
import
'package:flutter/painting.dart'
;
void
main
(
)
{
testWidgets
(
'Text widget parameter takes precedence over DefaultTextHeightBehavior'
,
(
WidgetTester
tester
)
async
{
const
TextHeightBehavior
behavior1
=
TextHeightBehavior
(
applyHeightToLastDescent:
false
,
applyHeightToFirstAscent:
false
,
);
const
TextHeightBehavior
behavior2
=
TextHeightBehavior
(
applyHeightToLastDescent:
true
,
applyHeightToFirstAscent:
false
,
);
await
tester
.
pumpWidget
(
const
DefaultTextHeightBehavior
(
textHeightBehavior:
behavior2
,
child:
Text
(
'Hello'
,
textDirection:
TextDirection
.
ltr
,
textHeightBehavior:
behavior1
,
),
),
);
final
RichText
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
behavior1
);
});
testWidgets
(
'DefaultTextStyle.textHeightBehavior takes precedence over DefaultTextHeightBehavior '
,
(
WidgetTester
tester
)
async
{
const
TextHeightBehavior
behavior1
=
TextHeightBehavior
(
applyHeightToLastDescent:
false
,
applyHeightToFirstAscent:
false
,
);
const
TextHeightBehavior
behavior2
=
TextHeightBehavior
(
applyHeightToLastDescent:
true
,
applyHeightToFirstAscent:
false
,
);
await
tester
.
pumpWidget
(
const
DefaultTextStyle
(
style:
TextStyle
(),
textHeightBehavior:
behavior1
,
child:
DefaultTextHeightBehavior
(
textHeightBehavior:
behavior2
,
child:
Text
(
'Hello'
,
textDirection:
TextDirection
.
ltr
,
),
),
),
);
RichText
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
behavior1
);
await
tester
.
pumpWidget
(
const
DefaultTextHeightBehavior
(
textHeightBehavior:
behavior2
,
child:
DefaultTextStyle
(
style:
TextStyle
(),
textHeightBehavior:
behavior1
,
child:
Text
(
'Hello'
,
textDirection:
TextDirection
.
ltr
,
),
),
),
);
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
behavior1
);
});
testWidgets
(
'DefaultTextHeightBehavior changes propagate to Text'
,
(
WidgetTester
tester
)
async
{
const
Text
textWidget
=
Text
(
'Hello'
,
textDirection:
TextDirection
.
ltr
);
const
TextHeightBehavior
behavior1
=
TextHeightBehavior
(
applyHeightToLastDescent:
false
,
applyHeightToFirstAscent:
false
,
);
const
TextHeightBehavior
behavior2
=
TextHeightBehavior
(
applyHeightToLastDescent:
false
,
applyHeightToFirstAscent:
false
,
);
await
tester
.
pumpWidget
(
const
DefaultTextHeightBehavior
(
textHeightBehavior:
behavior1
,
child:
textWidget
,
));
RichText
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
behavior1
);
await
tester
.
pumpWidget
(
const
DefaultTextHeightBehavior
(
textHeightBehavior:
behavior2
,
child:
textWidget
,
));
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
behavior2
);
});
testWidgets
(
'DefaultTextHeightBehavior.of(context) returns null if no '
'DefaultTextHeightBehavior widget in tree'
,
(
WidgetTester
tester
)
async
{
const
Text
textWidget
=
Text
(
'Hello'
,
textDirection:
TextDirection
.
ltr
);
TextHeightBehavior
textHeightBehavior
;
await
tester
.
pumpWidget
(
Builder
(
builder:
(
BuildContext
context
)
{
textHeightBehavior
=
DefaultTextHeightBehavior
.
of
(
context
);
return
textWidget
;
},
));
expect
(
textHeightBehavior
,
isNull
);
final
RichText
text
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
text
,
isNotNull
);
expect
(
text
.
textHeightBehavior
,
isNull
);
});
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment