🚀 Improve CNP in tree

Author: AlexV525

example/lib/customs/pickers/multi_tabs_assets_picker.dart

@@ -2,9 +2,11 @@
 /// [Author] Alex (https://github.com/AlexV525)
 /// [Date] 2022/2/10 09:57
 ///
+import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
@@ -529,4 +531,24 @@ class MultiTabAssetPickerBuilder extends DefaultAssetPickerBuilderDelegate {
       },
     );
   }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: overlayStyle,
+      child: Theme(
+        data: theme,
+        child: Material(
+          color: theme.canvasColor,
+          child: Stack(
+            fit: StackFit.expand,
+            children: <Widget>[
+              if (isAppleOS) appleOSLayout(context) else androidLayout(context),
+              if (Platform.isIOS) iOSPermissionOverlay(context),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -2092,21 +2092,29 @@ class DefaultAssetPickerBuilderDelegate
         }
       });
     }
-    return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: overlayStyle,
-      child: Theme(
-        data: theme,
-        child: Material(
-          color: theme.canvasColor,
-          child: Stack(
-            fit: StackFit.expand,
-            children: <Widget>[
-              if (isAppleOS) appleOSLayout(context) else androidLayout(context),
-              if (Platform.isIOS) iOSPermissionOverlay(context),
-            ],
+    return CNP<DefaultAssetPickerProvider>.value(
+      value: provider,
+      builder: (BuildContext context, _) {
+        return AnnotatedRegion<SystemUiOverlayStyle>(
+          value: overlayStyle,
+          child: Theme(
+            data: theme,
+            child: Material(
+              color: theme.canvasColor,
+              child: Stack(
+                fit: StackFit.expand,
+                children: <Widget>[
+                  if (isAppleOS)
+                    appleOSLayout(context)
+                  else
+                    androidLayout(context),
+                  if (Platform.isIOS) iOSPermissionOverlay(context),
+                ],
+              ),
+            ),
           ),
-        ),
-      ),
+        );
+      },
     );
   }
 }

lib/src/widget/asset_picker.dart

@@ -9,7 +9,6 @@ import 'package:photo_manager/photo_manager.dart';
 
 import '../constants/config.dart';
 import '../constants/constants.dart';
-import '../constants/extensions.dart';
 import '../delegates/asset_picker_builder_delegate.dart';
 import '../internal/methods.dart';
 import '../internal/singleton.dart';
@@ -47,28 +46,25 @@ class AssetPicker<Asset, Path> extends StatefulWidget {
       sortPathDelegate: pickerConfig.sortPathDelegate,
       filterOptions: pickerConfig.filterOptions,
     );
-    final Widget picker = CNP<DefaultAssetPickerProvider>.value(
-      value: provider,
-      child: AssetPicker<AssetEntity, AssetPathEntity>(
-        key: Singleton.pickerKey,
-        builder: DefaultAssetPickerBuilderDelegate(
-          provider: provider,
-          initialPermission: _ps,
-          gridCount: pickerConfig.gridCount,
-          pickerTheme: pickerConfig.pickerTheme,
-          gridThumbSize: pickerConfig.gridThumbSize,
-          previewThumbSize: pickerConfig.previewThumbSize,
-          specialPickerType: pickerConfig.specialPickerType,
-          specialItemPosition: pickerConfig.specialItemPosition,
-          specialItemBuilder: pickerConfig.specialItemBuilder,
-          loadingIndicatorBuilder: pickerConfig.loadingIndicatorBuilder,
-          allowSpecialItemWhenEmpty: pickerConfig.allowSpecialItemWhenEmpty,
-          selectPredicate: pickerConfig.selectPredicate,
-          shouldRevertGrid: pickerConfig.shouldRevertGrid,
-          textDelegate: pickerConfig.textDelegate,
-          themeColor: pickerConfig.themeColor,
-          locale: Localizations.maybeLocaleOf(context),
-        ),
+    final Widget picker = AssetPicker<AssetEntity, AssetPathEntity>(
+      key: Singleton.pickerKey,
+      builder: DefaultAssetPickerBuilderDelegate(
+        provider: provider,
+        initialPermission: _ps,
+        gridCount: pickerConfig.gridCount,
+        pickerTheme: pickerConfig.pickerTheme,
+        gridThumbSize: pickerConfig.gridThumbSize,
+        previewThumbSize: pickerConfig.previewThumbSize,
+        specialPickerType: pickerConfig.specialPickerType,
+        specialItemPosition: pickerConfig.specialItemPosition,
+        specialItemBuilder: pickerConfig.specialItemBuilder,
+        loadingIndicatorBuilder: pickerConfig.loadingIndicatorBuilder,
+        allowSpecialItemWhenEmpty: pickerConfig.allowSpecialItemWhenEmpty,
+        selectPredicate: pickerConfig.selectPredicate,
+        shouldRevertGrid: pickerConfig.shouldRevertGrid,
+        textDelegate: pickerConfig.textDelegate,
+        themeColor: pickerConfig.themeColor,
+        locale: Localizations.maybeLocaleOf(context),
       ),
     );
     final List<AssetEntity>? result = await Navigator.of(