Merge pull request #64 from dukefirehawk/migrated/bug-fix-6

Fixed scrolling exception

Author: dukefirehawk

angular_components/lib/utils/angular/scroll_host/angular_2.dart

@@ -51,9 +51,13 @@ class ElementScrollHost implements OnInit, OnDestroy, ElementScrollHostBase {
   final StreamController<Null> _onUpdate =
       StreamController.broadcast(sync: true);
 
-  late ElementScrollHostBase _scrollHost;
+  ElementScrollHostBase? _scrollHost;
 
-  late bool _disableAutoScroll;
+  ElementScrollHostBase get scrollHost {
+    return _scrollHost!;
+  }
+
+  bool _disableAutoScroll = false;
   bool _usePositionSticky = false;
   bool _useTouchGestureListener = true;
   bool _enableSmoothPushing = false;
@@ -67,7 +71,7 @@ class ElementScrollHost implements OnInit, OnDestroy, ElementScrollHostBase {
   }
 
   void _init() {
-    _scrollHost.dispose();
+    _scrollHost?.dispose();
     _scrollHost = ElementScrollHostBase(
         _domService, _ngZone, _gestureListenerFactory, element,
         usePositionSticky: _usePositionSticky,
@@ -160,81 +164,81 @@ class ElementScrollHost implements OnInit, OnDestroy, ElementScrollHostBase {
 
   @override
   void dispose() {
-    _scrollHost.dispose();
+    scrollHost.dispose();
     _onUpdate.close();
   }
 
   @override
-  Rectangle calcViewportRect() => _scrollHost.calcViewportRect();
+  Rectangle calcViewportRect() => scrollHost.calcViewportRect();
 
   @override
-  void scrollToPosition(int position) => _scrollHost.scrollToPosition(position);
+  void scrollToPosition(int position) => scrollHost.scrollToPosition(position);
 
   @override
-  void scrollWithDelta(int delta) => _scrollHost.scrollWithDelta(delta);
+  void scrollWithDelta(int delta) => scrollHost.scrollWithDelta(delta);
 
   @override
-  void startNativeScrollListener() => _scrollHost.startNativeScrollListener();
+  void startNativeScrollListener() => scrollHost.startNativeScrollListener();
 
   @override
-  int get scrollHeight => _scrollHost.scrollHeight;
+  int get scrollHeight => scrollHost.scrollHeight;
 
   @override
-  int get clientHeight => _scrollHost.clientHeight;
+  int get clientHeight => scrollHost.clientHeight;
 
   @override
-  Stream<ScrollHostEvent> get nativeOnScroll => _scrollHost.nativeOnScroll;
+  Stream<ScrollHostEvent> get nativeOnScroll => scrollHost.nativeOnScroll;
 
   @override
-  bool get usePositionSticky => _scrollHost.usePositionSticky;
+  bool get usePositionSticky => scrollHost.usePositionSticky;
 
   @override
-  bool get useTouchGestureListener => _scrollHost.useTouchGestureListener;
+  bool get useTouchGestureListener => scrollHost.useTouchGestureListener;
 
   @override
-  bool get throttleScrollEvents => _scrollHost.throttleScrollEvents;
+  bool get throttleScrollEvents => scrollHost.throttleScrollEvents;
 
   @override
-  GlobalEventHandlers get scrollbarHost => _scrollHost.scrollbarHost;
+  GlobalEventHandlers get scrollbarHost => scrollHost.scrollbarHost;
 
   @override
-  int get clientWidth => _scrollHost.clientWidth;
+  int get clientWidth => scrollHost.clientWidth;
 
   @override
-  num get offsetX => _scrollHost.offsetX;
+  num get offsetX => scrollHost.offsetX;
 
   @override
-  num get offsetY => _scrollHost.offsetY;
+  num get offsetY => scrollHost.offsetY;
 
   @override
-  Element get anchorElement => _scrollHost.anchorElement;
+  Element get anchorElement => scrollHost.anchorElement;
 
   @override
-  Stream<ScrollHostEvent>? get onScroll => _scrollHost.onScroll;
+  Stream<ScrollHostEvent>? get onScroll => scrollHost.onScroll;
 
   @override
-  PanController? get panController => _scrollHost.panController;
+  PanController? get panController => scrollHost.panController;
 
   @override
-  StickyController? get stickyController => _scrollHost.stickyController;
+  StickyController? get stickyController => scrollHost.stickyController;
 
   @override
-  int get scrollLength => _scrollHost.scrollLength;
+  int get scrollLength => scrollHost.scrollLength;
 
   @override
-  int get scrollPosition => _scrollHost.scrollPosition;
+  int get scrollPosition => scrollHost.scrollPosition;
 
   @override
   Stream<IntersectionObserverEntry?> onIntersection(Element? element) =>
-      _scrollHost.onIntersection(element);
+      scrollHost.onIntersection(element);
 
   @override
   void ngOnDestroy() {
     dispose();
   }
 
   @override
-  void stopEvent(WheelEvent event) => _scrollHost.stopEvent(event);
+  void stopEvent(WheelEvent event) => scrollHost.stopEvent(event);
 }
 
 /// Provides a scroll host that uses the browser window content area.

angular_components/pubspec.yaml

@@ -22,8 +22,7 @@ dependencies:
   js: ^0.6.1
   logging: ^1.0.2
   meta: ^1.0.4
-  observable:
-    git: https://github.com/google/observable
+  observable: ^0.24.0
   protobuf: ^2.0.0
   quiver: ^3.0.1
   sass_builder: ^2.0.2

angular_gallery_section/lib/gallery_section_config_extraction.dart

@@ -14,7 +14,7 @@ import 'src/common_extractors.dart';
 /// Extracts the information from @GallerySectionConfig annotations.
 ///
 /// The asset identified by [assetId] will be read using [assetReader].
-Future<Iterable<ConfigInfo?>?> extractGallerySectionConfigs(
+Future<Iterable<ConfigInfo>?> extractGallerySectionConfigs(
         AssetId assetId, AssetReader assetReader) async =>
     parseString(
       content: await assetReader.readAsString(assetId),
@@ -23,11 +23,12 @@ Future<Iterable<ConfigInfo?>?> extractGallerySectionConfigs(
 /// [AstVisitor] to extract multiple @GallerySectionConfig annotations, and
 /// the parameters they are constructed with.
 class GallerySectionConfigExtraction
-    extends SimpleAstVisitor<Iterable<ConfigInfo?>> {
+    extends SimpleAstVisitor<Iterable<ConfigInfo>> {
   @override
   visitCompilationUnit(CompilationUnit node) => node.declarations
       .map((delcaration) => delcaration.accept(_GallerySectionConfigVisitor()))
-      .where((config) => config != null);
+      .where((config) => config != null)
+      .cast<ConfigInfo>();
 }
 
 /// [AstVisitor] to extract a single @GallerySectionConfig annotation, applied
@@ -38,7 +39,7 @@ class _GallerySectionConfigVisitor extends SimpleAstVisitor<ConfigInfo> {
   ConfigInfo? config;
 
   @override
-  visitClassDeclaration(ClassDeclaration node) {
+  ConfigInfo? visitClassDeclaration(ClassDeclaration node) {
     for (final metadata in node.metadata) {
       if (metadata.name.name == 'GallerySectionConfig') {
         config = ConfigInfo();
@@ -87,7 +88,7 @@ class _GallerySectionConfigVisitor extends SimpleAstVisitor<ConfigInfo> {
 /// extracted as Strings.
 class ConfigInfo {
   String displayName = '';
-  String group = '';
+  String? group;
   Iterable<String> docs = [];
   Iterable<String> demoClassNames = [];
   String mainDemoName = '';

angular_gallery_section/lib/resolved_config.dart

@@ -12,7 +12,7 @@ final _invalidCharacters = RegExp(r'[^a-zA-Z0-9 ]');
 /// resolved from raw Strings to the values used by the gallery generators.
 class ResolvedConfig {
   String displayName = '';
-  String group = '';
+  String? group;
   Iterable<DocInfo> docs = [];
   Iterable<DemoInfo> demos = [];
   DemoInfo? mainDemo;
@@ -48,7 +48,7 @@ class ResolvedConfig {
   /// Constructs a new [ResolvedConfig] from a decoded json map.
   ResolvedConfig.fromJson(Map<String, dynamic> jsonMap) {
     displayName = jsonMap['displayName'] as String;
-    group = jsonMap['group'] as String;
+    group = jsonMap['group'] as String?;
 
     docs = (jsonMap['docs'] as Iterable?)
             ?.map((element) => DocInfo.fromJson(element)) ??

examples/angular_components_example/README.md

@@ -10,15 +10,15 @@ Build the entire gallery from the `examples/angular_components_example`
 directory.
 
 ```
-pub run build_runner build --output <output directory>
+dart run build_runner build --output <output directory>
 ```
 
 ## Serve
 
 Run a local development server with a file watcher and incremental rebuilds:
 
 ```
-pub run build_runner serve web
+dart run build_runner serve web
 ```
 
 Both of the __build__ and __serve__ commands will accept `--release` to build

examples/angular_components_example/pubspec.yaml

@@ -70,5 +70,3 @@ dev_dependencies:
 dependency_overrides:
   angular_components:
     path: ../../angular_components
-  observable:
-    git: https://github.com/google/observable

examples/material_menu_example/pubspec.yaml

@@ -12,8 +12,7 @@ dependencies:
   angular_gallery_section:
     path: ../../angular_gallery_section
   build_config: ^1.0.0
-  observable: #^0.23.0
-    git: https://github.com/google/observable
+  observable: ^0.24.0
 
 dependency_overrides:
   angular_components: