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

Enable CupertinoContextMenu on Web (#52977)

Browse Source
This commit is contained in:
Justin McCandless 2020-03-23 11:01:02 -07:00 committed by GitHub
parent 9f4e5ad9c3
commit 197ac5256e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/flutter/lib/src/cupertino/context_menu.dart
View File

@ -5,6 +5,7 @@
import 'dart:math' as math;
import 'dart:ui' as ui;
import 'package:flutter/gestures.dart' show kMinFlingVelocity, kLongPressTimeout;
import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter/rendering.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
@ -511,17 +512,22 @@ class _DecoyChildState extends State<_DecoyChild> with TickerProviderStateMixin
: _mask.value;
return Positioned.fromRect(
rect: _rect.value,
child: ShaderMask(
key: _childGlobalKey,
shaderCallback: (Rect bounds) {
return LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: <Color>[color, color],
).createShader(bounds);
},
child: widget.child,
),
// TODO(justinmc): When ShaderMask is supported on web, remove this
// conditional and use ShaderMask everywhere.
// https://github.com/flutter/flutter/issues/52967.
child: kIsWeb
? Container(key: _childGlobalKey, child: widget.child)
: ShaderMask(
key: _childGlobalKey,
shaderCallback: (Rect bounds) {
return LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: <Color>[color, color],
).createShader(bounds);
},
child: widget.child,
),
);
}

6
packages/flutter/test/cupertino/context_menu_test.dart
View File

@ -4,6 +4,7 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart' show kIsWeb;
void main() {
final TestWidgetsFlutterBinding binding =
@ -103,6 +104,11 @@ void main() {
Rect decoyChildRect = tester.getRect(_findDecoyChild(child));
expect(childRect, equals(decoyChildRect));
// TODO(justinmc): When ShaderMask is supported on web, remove this
// conditional and just check for ShaderMask.
// https://github.com/flutter/flutter/issues/52967.
expect(find.byType(ShaderMask), kIsWeb ? findsNothing : findsOneWidget);
// After a small delay, the _DecoyChild has begun to animate.
await tester.pump(const Duration(milliseconds: 100));
decoyChildRect = tester.getRect(_findDecoyChild(child));