firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Sliver Constrained Cross Axis" (#125233)

Browse Source 
Going to make some changes to the implementation so I'll revert in the meantime.

Reverts flutter/flutter#124337
This commit is contained in:
Tae Hyung Kim 2023-04-20 14:47:50 -04:00 committed by GitHub
parent 0c7bc2f9c9
commit 9caabdd220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart
View File

@ -1,51 +0,0 @@
// 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 'package:flutter/material.dart';
void main() => runApp(const SliverConstrainedCrossAxisExampleApp());
class SliverConstrainedCrossAxisExampleApp extends StatelessWidget {
const SliverConstrainedCrossAxisExampleApp({super.key});
@override
Widget build(BuildContext context) {
return MaterialApp(
home: Scaffold(
appBar: AppBar(title: const Text('SliverConstrainedCrossAxis Sample')),
body: const SliverConstrainedCrossAxisExample(),
),
);
}
}
class SliverConstrainedCrossAxisExample extends StatelessWidget {
const SliverConstrainedCrossAxisExample({super.key});
@override
Widget build(BuildContext context) {
return CustomScrollView(
slivers: <Widget>[
SliverConstrainedCrossAxis(
maxExtent: 200,
sliver: SliverList.builder(
itemBuilder: (BuildContext context, int index) {
return Container(
color: index.isEven ? Colors.amber[300] : Colors.blue[300],
height: 100.0,
child: Center(
child: Text(
'Item $index',
style: const TextStyle(fontSize: 24),
),
),
);
},
itemCount: 10,
),
),
],
);
}
}

20
examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart
View File

@ -1,20 +0,0 @@
// 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 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_api_samples/widgets/sliver/sliver_constrained_cross_axis.0.dart'
as example;
import 'package:flutter_test/flutter_test.dart';
void main() {
testWidgets('SliverConstrainedCrossAxis example', (WidgetTester tester) async {
await tester.pumpWidget(
const example.SliverConstrainedCrossAxisExampleApp(),
);
final RenderSliverList renderSliverList = tester.renderObject(find.byType(SliverList));
expect(renderSliverList.constraints.crossAxisExtent, equals(200));
});
}

40
packages/flutter/lib/src/rendering/proxy_sliver.dart
View File

@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:math';
import 'dart:ui' as ui show Color; import 'dart:ui' as ui show Color;
import 'package:flutter/animation.dart'; import 'package:flutter/animation.dart';
@ -415,42 +414,3 @@ class RenderSliverAnimatedOpacity extends RenderProxySliver with RenderAnimatedO
child = sliver; child = sliver;
} }
} }
/// Applies a cross-axis constraint to its sliver child.
///
/// This render object takes a [maxExtent] parameter and uses the smaller of
/// [maxExtent] and the parent's [SliverConstraints.crossAxisExtent] as the
/// cross axis extent of the [SliverConstraints] passed to the sliver child.
class RenderSliverConstrainedCrossAxis extends RenderProxySliver {
/// Creates a render object that constrains the cross axis extent of its sliver child.
///
/// The [maxExtent] parameter must not be null and must be nonnegative.
RenderSliverConstrainedCrossAxis({
required double maxExtent
}) : _maxExtent = maxExtent,
assert(maxExtent >= 0.0);
/// The cross axis extent to apply to the sliver child.
///
/// This value must be nonnegative.
double get maxExtent => _maxExtent;
double _maxExtent;
set maxExtent(double value) {
if (_maxExtent == value) {
return;
}
_maxExtent = value;
markNeedsLayout();
}
@override
void performLayout() {
assert(child != null);
assert(maxExtent >= 0.0);
child!.layout(
constraints.copyWith(crossAxisExtent: min(_maxExtent, constraints.crossAxisExtent)),
parentUsesSize: true,
);
geometry = child!.geometry;
}
}

44
packages/flutter/lib/src/widgets/sliver.dart
View File

@ -1365,47 +1365,3 @@ class KeepAlive extends ParentDataWidget<KeepAliveParentDataMixin> {
properties.add(DiagnosticsProperty<bool>('keepAlive', keepAlive)); properties.add(DiagnosticsProperty<bool>('keepAlive', keepAlive));
} }
} }
/// A sliver that constrains the cross axis extent of its sliver child.
///
/// The [SliverConstrainedCrossAxis] takes a [maxExtent] parameter and uses it as
/// the cross axis extent of the [SliverConstraints] passed to the sliver child.
/// The widget ensures that the [maxExtent] is a nonnegative value.
///
/// This is useful when you want to apply a custom cross-axis extent constraint
/// to a sliver child, as slivers typically consume the full cross axis extent.
///
/// {@tool dartpad}
/// In this sample the [SliverConstrainedCrossAxis] sizes its [child] so that the
/// cross axis extent takes up less space than the actual viewport.
///
/// ** See code in examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart **
/// {@end-tool}
class SliverConstrainedCrossAxis extends SingleChildRenderObjectWidget {
/// Creates a sliver that constrains the cross axis extent of its sliver child.
///
/// The [maxExtent] parameter is required and must be nonnegative.
const SliverConstrainedCrossAxis({
super.key,
required this.maxExtent,
required Widget sliver,
}) : assert(maxExtent >= 0.0),
super(child: sliver);
/// The cross axis extent to apply to the sliver child.
///
/// This value must be nonnegative.
final double maxExtent;
@override
RenderSliverConstrainedCrossAxis createRenderObject(BuildContext context) {
return RenderSliverConstrainedCrossAxis(maxExtent: maxExtent);
}
@override
void updateRenderObject(
BuildContext context, RenderSliverConstrainedCrossAxis renderObject) {
renderObject.maxExtent = maxExtent;
}
}

83
packages/flutter/test/widgets/sliver_constrained_cross_axis_test.dart
View File

@ -1,83 +0,0 @@
// 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 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
const double VIEWPORT_HEIGHT = 500;
const double VIEWPORT_WIDTH = 300;
void main() {
testWidgets('SliverConstrainedCrossAxis basic test', (WidgetTester tester) async {
await tester.pumpWidget(_buildSliverConstrainedCrossAxis(maxExtent: 50));
final RenderBox box = tester.renderObject(find.byType(Container));
expect(box.size.height, 100);
expect(box.size.width, 50);
final RenderSliver sliver = tester.renderObject(find.byType(SliverToBoxAdapter));
expect(sliver.geometry!.paintExtent, equals(100));
});
testWidgets('SliverConstrainedCrossAxis updates correctly', (WidgetTester tester) async {
await tester.pumpWidget(_buildSliverConstrainedCrossAxis(maxExtent: 50));
final RenderBox box1 = tester.renderObject(find.byType(Container));
expect(box1.size.height, 100);
expect(box1.size.width, 50);
await tester.pumpWidget(_buildSliverConstrainedCrossAxis(maxExtent: 80));
final RenderBox box2 = tester.renderObject(find.byType(Container));
expect(box2.size.height, 100);
expect(box2.size.width, 80);
});
testWidgets('SliverConstrainedCrossAxis uses parent extent if maxExtent is greater', (WidgetTester tester) async {
await tester.pumpWidget(_buildSliverConstrainedCrossAxis(maxExtent: 400));
final RenderBox box = tester.renderObject(find.byType(Container));
expect(box.size.height, 100);
expect(box.size.width, VIEWPORT_WIDTH);
});
testWidgets('SliverConstrainedCrossAxis constrains the height when direction is horizontal', (WidgetTester tester) async {
await tester.pumpWidget(_buildSliverConstrainedCrossAxis(
maxExtent: 50,
scrollDirection: Axis.horizontal,
));
final RenderBox box = tester.renderObject(find.byType(Container));
expect(box.size.height, 50);
});
}
Widget _buildSliverConstrainedCrossAxis({
required double maxExtent,
Axis scrollDirection = Axis.vertical,
}) {
return Directionality(
textDirection: TextDirection.ltr,
child: Center(
child: SizedBox(
width: VIEWPORT_WIDTH,
height: VIEWPORT_HEIGHT,
child: CustomScrollView(
scrollDirection: scrollDirection,
slivers: <Widget>[
SliverConstrainedCrossAxis(
maxExtent: maxExtent,
sliver: SliverToBoxAdapter(
child: scrollDirection == Axis.vertical
? Container(height: 100)
: Container(width: 100),
),
),
],
),
),
),
);
}