Skip to content

Commit

Permalink
Merge branch 'v3.0.x' of https://github.com/Tencent/Hippy into v3.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
zealotchen0 committed Aug 22, 2023
2 parents ed6c33e + c6abd8e commit d89fe35
Show file tree
Hide file tree
Showing 82 changed files with 937 additions and 356 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/pod_spec_lint.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/pod_spec_lint_bypass.yml

This file was deleted.

2 changes: 1 addition & 1 deletion dom/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if ("${LAYOUT_ENGINE}" STREQUAL "Yoga")
target_link_libraries(${PROJECT_NAME} PRIVATE yogacore)
elseif ("${LAYOUT_ENGINE}" STREQUAL "Taitank")
InfraPackage_Add(taitank
REMOTE "dom/third_party/taitank/1.0.2/git-repo.tgz"
REMOTE "dom/third_party/taitank/1.0.5/git-repo.tgz"
LOCAL "third_party/taitank"
)
target_link_libraries(${PROJECT_NAME} PRIVATE taitank)
Expand Down
3 changes: 2 additions & 1 deletion dom/src/dom/taitank_layout_node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ TAITANK_GET_STYLE_DECL(Direction, TaitankDirection, TaitankDirection::DIRECTION_
}

static void CheckValueType(footstone::value::HippyValue::Type type) {
FOOTSTONE_DCHECK(type == footstone::value::HippyValue::Type::kNumber || type == footstone::value::HippyValue::Type::kObject);
if (type == footstone::value::HippyValue::Type::kNumber || type == footstone::value::HippyValue::Type::kObject)
FOOTSTONE_DLOG(WARNING) << "Taitank Layout Node Value Type Error";
}

static float GetDefaultValue(
Expand Down
53 changes: 53 additions & 0 deletions driver/js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,59 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)


### Bug Fixes

* **action:** fix 3.0 release and compare action ([8b3f572](https://github.com/Tencent/Hippy/commit/8b3f572cc94fe2759ad23950cbcfe15b5b269fa6))
* **android:** add call function log ([5fc52e4](https://github.com/Tencent/Hippy/commit/5fc52e4312cb6237d8d94cda96792aa8d578f58c))
* **android:** event to lower case ([e368ad5](https://github.com/Tencent/Hippy/commit/e368ad584540c3ee07ce0891a6d7b8eb8bb793f9))
* **android:** fix incremental build ([06c22c2](https://github.com/Tencent/Hippy/commit/06c22c270e05fbc1ca40c95e834bcf9ffc6136a4))
* **android:** initialContentOffset not working ([3e3b5a8](https://github.com/Tencent/Hippy/commit/3e3b5a868ed78188812927ef724cd692c7aef2ad))
* **android:** issues of ScrollEvent ([#3362](https://github.com/Tencent/Hippy/issues/3362)) ([733f303](https://github.com/Tencent/Hippy/commit/733f303a4fd1cac5a7bc0d8a57742d4d008834ce))
* **android:** non flattened elements background color ([#3352](https://github.com/Tencent/Hippy/issues/3352)) ([2a7402a](https://github.com/Tencent/Hippy/commit/2a7402a52be698f2df15b2ee604217807c973804))
* **android:** recycle view event use low case name ([a4f4cde](https://github.com/Tencent/Hippy/commit/a4f4cde9a1d45bb556ec3390eaa99a28de503d46))
* **android:** sticky header not deleted from ControllerManager ([#3356](https://github.com/Tencent/Hippy/issues/3356)) ([797eadd](https://github.com/Tencent/Hippy/commit/797eaddbf034ac5d95e3a5f73547a904df2671ce))
* **android:** supply some layout style for filter ([6ff2398](https://github.com/Tencent/Hippy/commit/6ff239840299bbd89827e8f33f791f743b3a566d))
* **android:** support sparse array for call ui function ([0b06be7](https://github.com/Tencent/Hippy/commit/0b06be7810e7f12cae064050b1f67a7504167fc5))
* **android:** window and screen size use float ([6402189](https://github.com/Tencent/Hippy/commit/640218905b33fb39f51a482ab2846f50517f6d9f))
* **devtools:** fix location double for all ([fb1be52](https://github.com/Tencent/Hippy/commit/fb1be5210d677b4ec246e714667f0077b9405787))
* **dom:** filter nodes with same style ([82a0792](https://github.com/Tencent/Hippy/commit/82a079231e8d18d6873f34dadab81b46ab9bb351))
* **dom:** fix dom ext style diff error ([e3351e6](https://github.com/Tencent/Hippy/commit/e3351e66c79c82faa5088db089d486084d78a04f))
* **dom:** fix event empty pointer ([c690f86](https://github.com/Tencent/Hippy/commit/c690f8645bf722e6db933d4b363b30b1506780a3))
* **dom:** fix modifying event by multi hippy engine ([4a731a2](https://github.com/Tencent/Hippy/commit/4a731a2f658f14fcf1f11936a0405f77c3f79344))
* **dom:** fix vue diff style alogrithm ([3463362](https://github.com/Tencent/Hippy/commit/346336231078ff88a9459c6651fe6202923a20f1))
* **ios:** add semaphore to make sure scope is created ([f27c513](https://github.com/Tencent/Hippy/commit/f27c51327fbfb810a11970b54e89bd07b2c76339))
* **ios:** fix crash caused by null pointer ([15e2bc5](https://github.com/Tencent/Hippy/commit/15e2bc5c3b414633df189de43e1030b27cf45468))
* **ios:** fix gradient color drawing bug ([a0e11c4](https://github.com/Tencent/Hippy/commit/a0e11c496b4c32787cafcc6d08fd9cd11fc9530b))
* **ios:** fix ios event capture and bubbling process ([1d05545](https://github.com/Tencent/Hippy/commit/1d05545d7b9c53b7cfeb7a2c0d975d18a517b49d))
* **ios:** remove the semicolon after namespace syntax ([a132dea](https://github.com/Tencent/Hippy/commit/a132dea5f8079dcea31f15d6f7ef4dab82db39b9))
* **ios:** support intercept touche event ([a85040d](https://github.com/Tencent/Hippy/commit/a85040d4515b21d08aee53df8311c65591befeea))
* **jsc:** fix jsc crash on ios12 ([d78bb47](https://github.com/Tencent/Hippy/commit/d78bb47e0083ce96b3c92ab717ba9bde027ec067))
* **jsc:** fix JSCCtxValue crash after destroy engine ([a166fe3](https://github.com/Tencent/Hippy/commit/a166fe347cc461fcbaec15ba93b08da17461e37e))
* **jsc:** temporarily used for testing jsc crash ([a053f1a](https://github.com/Tencent/Hippy/commit/a053f1a68438d4eceb3e052ee8a75d6a178b8b51))
* **voltron:** fix crash when dom value type error ([ffbab34](https://github.com/Tencent/Hippy/commit/ffbab348fcf1638b484c3a105608d8f385741d68))
* **voltron:** fix voltron android scope not erase when destroy ([eebd7a1](https://github.com/Tencent/Hippy/commit/eebd7a1d437e73c117f1a642e628f969f8f5fc37))
* **vue-next:** fix element do not use beforeLoadStyle hooks issue ([604a231](https://github.com/Tencent/Hippy/commit/604a23193f032e7911c4168ee0e3203efcbb33e4))
* **vue:** fix rootview conditional statement ([#3355](https://github.com/Tencent/Hippy/issues/3355)) ([5364548](https://github.com/Tencent/Hippy/commit/5364548e5f3cb11d501b79989419e3608c2562da))


### Features

* **android:** add filter for css style to native renderer ([#3405](https://github.com/Tencent/Hippy/issues/3405)) ([c459934](https://github.com/Tencent/Hippy/commit/c45993435633b938587d1a29196fe4a26d489326))
* **dom:** fix empty dom event function crash ([388beef](https://github.com/Tencent/Hippy/commit/388beef1fb648b66b903b02d25c94a5c90ed62b2))
* **dom:** measure textinput node ([c9cedd1](https://github.com/Tencent/Hippy/commit/c9cedd14adcff622dbdca75bb2d7f5f9d77b33f9))
* **dom:** remove DCHECK for taitank node ([c779738](https://github.com/Tencent/Hippy/commit/c779738d5dddb9f8bd116a8e2cc8f252805149ab))
* **ios:** add 'SetRootOrigin' function for root node ([ef7d9ce](https://github.com/Tencent/Hippy/commit/ef7d9ce506feb073d72164c99a77830e7a462679))
* **ios:** strip hippyconvenientbridge from bridge module to host module ([3f28b9e](https://github.com/Tencent/Hippy/commit/3f28b9e6fd47ac9a6b4af4bc59dc791ae7f6b1a2))
* **voltron:** publish voltron 0.0.31 ([#3375](https://github.com/Tencent/Hippy/issues/3375)) ([f02c1a7](https://github.com/Tencent/Hippy/commit/f02c1a7830b0e860ed6203e3cdaab633eaf80606))
* **voltron:** update workflow xcode version ([2fcd955](https://github.com/Tencent/Hippy/commit/2fcd9559a192ab2c48709f7c5c04c76c04b3bf59))





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
1 change: 1 addition & 0 deletions driver/js/include/driver/scope.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ struct ClassTemplate {
string_view name;
size_t size = SIZE_OF<T>;
std::unordered_map<void*, std::shared_ptr<T>> holder_map;
std::vector<std::shared_ptr<CtxValue>> holder_ctx_values;
};

class Scope : public std::enable_shared_from_this<Scope> {
Expand Down
9 changes: 8 additions & 1 deletion driver/js/include/driver/vm/jsc/jsc_vm.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include "driver/vm/js_vm.h"

#include <set>
#include <JavaScriptCore/JavaScriptCore.h>

#include "footstone/string_view.h"
Expand All @@ -49,6 +49,13 @@ class JSCVM : public VM, public std::enable_shared_from_this<JSCVM> {
std::unordered_map<void*, std::unordered_map<JSClassRef, std::unique_ptr<ConstructorData>>> constructor_data_holder_;
JSContextGroupRef vm_;

static void SaveConstructorDataPtr(void* ptr);
static void ClearConstructorDataPtr(void* ptr);
static bool IsValidConstructorDataPtr(void* ptr);

static std::set<void*> constructor_data_ptr_set_;
static std::mutex mutex_;

virtual std::shared_ptr<CtxValue> ParseJson(const std::shared_ptr<Ctx>& ctx, const string_view& json) override;
virtual std::shared_ptr<Ctx> CreateContext() override;

Expand Down
2 changes: 1 addition & 1 deletion driver/js/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"packages/*"
],
"tagVersionPrefix": "",
"version": "3.0.0"
"version": "3.0.1"
}
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-react-web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/react-web





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
4 changes: 2 additions & 2 deletions driver/js/packages/hippy-react-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion driver/js/packages/hippy-react-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/react-web",
"version": "3.0.0",
"version": "3.0.1",
"description": "Web Adapter for Hippy React",
"main": "dist/cjs/index.js",
"module": "dist/index.js",
Expand Down
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/react





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
4 changes: 2 additions & 2 deletions driver/js/packages/hippy-react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion driver/js/packages/hippy-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/react",
"version": "3.0.0",
"version": "3.0.1",
"description": "Hippy react framework",
"main": "dist/index.js",
"homepage": "https://hippyjs.org",
Expand Down
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-vue-css-loader/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/vue-css-loader





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
4 changes: 2 additions & 2 deletions driver/js/packages/hippy-vue-css-loader/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion driver/js/packages/hippy-vue-css-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/vue-css-loader",
"version": "3.0.0",
"version": "3.0.1",
"description": "hippy-vue style loader module for webpack",
"main": "dist/css-loader.js",
"homepage": "https://hippyjs.org",
Expand Down
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-vue-loader/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/vue-loader





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
2 changes: 1 addition & 1 deletion driver/js/packages/hippy-vue-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/vue-loader",
"version": "3.0.0",
"version": "3.0.1",
"description": "Vue single-file component loader for Webpack",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-vue-native-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/vue-native-components





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/vue-native-components",
"version": "3.0.0",
"version": "3.0.1",
"description": "Native components middleware for Hippy-Vue, the components only for native, can't compatible with web.",
"main": "dist/index.js",
"homepage": "https://hippyjs.org",
Expand Down
8 changes: 8 additions & 0 deletions driver/js/packages/hippy-vue-next-style-parser/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)

**Note:** Version bump only for package @hippy/hippy-vue-next-style-parser





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hippy/hippy-vue-next-style-parser",
"version": "3.0.0",
"version": "3.0.1",
"description": "A css subset parser for hippy-vue-next",
"author": "OpenHippy Team",
"homepage": "https://hippyjs.org",
Expand Down
11 changes: 11 additions & 0 deletions driver/js/packages/hippy-vue-next/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.1](https://github.com/Tencent/Hippy/compare/3.0.0...3.0.1) (2023-08-07)


### Bug Fixes

* **vue-next:** fix element do not use beforeLoadStyle hooks issue ([604a231](https://github.com/Tencent/Hippy/commit/604a23193f032e7911c4168ee0e3203efcbb33e4))





# [3.0.0](https://github.com/Tencent/Hippy/compare/2.2.1...3.0.0) (2023-06-29)


Expand Down
Loading

0 comments on commit d89fe35

Please sign in to comment.