Merge branch 'main' of github.com:openkraken/kraken into fix/overflow…

…-hidden
openkraken · Nov 4, 2021 · e988700 · e988700
2 parents 9dba2c4 + 9c05f90
commit e988700
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/kraken/example/ios/Runner.xcodeproj/project.pbxproj b/kraken/example/ios/Runner.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample.andycall;
+				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -507,7 +507,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample.andycall;
+				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -538,7 +538,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample.andycall;
+				PRODUCT_BUNDLE_IDENTIFIER = com.openkraken.krakenExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

diff --git a/kraken/example/lib/main.dart b/kraken/example/lib/main.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:kraken/kraken.dart';
-import'package:kraken_websocket/kraken_websocket.dart';
+import 'package:kraken_websocket/kraken_websocket.dart';
+import 'package:kraken_devtools/kraken_devtools.dart';
 import 'dart:ui';
 
 void main() {
@@ -88,6 +89,7 @@ class _MyHomePageState extends State<MyBrowser> {
         // Center is a layout widget. It takes a single child and positions it
         // in the middle of the parent.
         child: _kraken = Kraken(
+          devToolsService: ChromeDevToolsService(),
           viewportWidth: viewportSize.width - queryData.padding.horizontal,
           viewportHeight: viewportSize.height - appBar.preferredSize.height - queryData.padding.vertical,
           bundleURL: 'assets/bundle.js',

diff --git a/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift b/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,12 +7,14 @@ import Foundation
 
 import connectivity_macos
 import kraken
+import kraken_devtools
 import kraken_websocket
 import shared_preferences_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   KrakenPlugin.register(with: registry.registrar(forPlugin: "KrakenPlugin"))
+  KrakenDevtoolsPlugin.register(with: registry.registrar(forPlugin: "KrakenDevtoolsPlugin"))
   KrakenWebsocketPlugin.register(with: registry.registrar(forPlugin: "KrakenWebsocketPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
 }
diff --git a/kraken/example/macos/Runner.xcodeproj/project.pbxproj b/kraken/example/macos/Runner.xcodeproj/project.pbxproj
@@ -264,7 +264,9 @@
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_macos/connectivity_macos.framework",
 				"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/kraken/macos/libkraken.dylib",
+				"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/kraken/macos/libquickjs.dylib",
 				"${BUILT_PRODUCTS_DIR}/kraken/kraken.framework",
+				"${BUILT_PRODUCTS_DIR}/kraken_devtools/kraken_devtools.framework",
 				"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/kraken_websocket/macos/libkraken_websocket.dylib",
 				"${BUILT_PRODUCTS_DIR}/kraken_websocket/kraken_websocket.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences_macos/shared_preferences_macos.framework",
@@ -274,7 +276,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_macos.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libkraken.dylib",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libquickjs.dylib",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/kraken.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/kraken_devtools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libkraken_websocket.dylib",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/kraken_websocket.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_macos.framework",

diff --git a/kraken/example/pubspec.yaml b/kraken/example/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
     sdk: flutter
   kraken: ^0.7.2
   kraken_websocket: ^1.0.0-dev.1
-#  kraken_devtools: ^0.3.0
+  kraken_devtools: ^0.4.0-dev.0
 
 # When depending on this package from a real application,
 # you should remove the following overrides.

diff --git a/kraken/lib/src/dom/elements/html.dart b/kraken/lib/src/dom/elements/html.dart
@@ -40,4 +40,7 @@ class HTMLElement extends Element {
     renderStyle.height = elementManager.viewportHeight;
     didAttachRenderer();
   }
+
+  @override
+  String get tagName => HTML;
 }
diff --git a/kraken/lib/src/dom/node.dart b/kraken/lib/src/dom/node.dart
@@ -27,6 +27,11 @@ class Comment extends Node {
   @override
   RenderObject? get renderer => null;
 
+  // @TODO: Get data from bridge side.
+  String get data => '';
+
+  int get length => data.length;
+
   @override
   dynamic handleJSCall(String method, List<dynamic> argv) {}
 }