Skip to content

fix(ohos): keep inline-box chrome with text #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bytemain wants to merge 1 commit into
base: staging2
Choose a base branch
from
Draft

fix(ohos): keep inline-box chrome with text #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/compose-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ jobs:
run: python3 tools/check-profiler-file-output-lifecycle.py --self-test
- name: Keep OHOS contentInset leading offsets aligned with the margin model
run: core-render-ohos/src/test/cpp/run_scroller_content_inset_offset_test.sh
- name: Keep text-only OHOS inline-box edges in the token's non-breaking word
run: core-render-ohos/src/test/cpp/run_inline_box_atomic_text_edge_test.sh

exact-matrix:
if: always()
Expand Down
58 changes: 58 additions & 0 deletions ...r-ohos/src/main/cpp/libohos_render/expand/components/richtext/KRInlineBoxAtomicTextEdge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Tencent is pleased to support the open source community by making KuiklyUI
* available.
* Copyright (C) 2025 Tencent. All rights reserved.
* Licensed under the License of KuiklyUI;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* https://github.com/Tencent-TDS/KuiklyUI/blob/main/LICENSE
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef CORE_RENDER_OHOS_KRINLINEBOXATOMICTEXTEDGE_H
#define CORE_RENDER_OHOS_KRINLINEBOXATOMICTEXTEDGE_H

#include <cstddef>

namespace kuikly::richtext {

// OH_Drawing placeholders are independent SkParagraph words, so a word
// joiner cannot bind a placeholder edge to the text inside an inline box.
// Text-only boxes instead reserve each edge with a non-breaking text cluster:
// a zero-font U+2011 NON-BREAKING HYPHEN has zero glyph advance and letter
// spacing supplies the exact requested width. Unlike NBSP it is not whitespace,
// so SkParagraph's too-long-word fallback cannot pick the edge itself as an
// intra-word space. ZWSP stays outside the box range to preserve legal breaks
// before and after the otherwise non-breaking group.
constexpr char16_t kInlineBoxBoundaryBreak = u'\u200B';
constexpr char16_t kInlineBoxReservedEdge = u'\u2011';
constexpr char16_t kInlineBoxWordJoiner = u'\u2060';

struct KRInlineBoxAtomicTextEdgeStyle {
float font_size_px = 0.0f;
float letter_spacing_px = 0.0f;
};

inline KRInlineBoxAtomicTextEdgeStyle KRMakeInlineBoxAtomicTextEdgeStyle(float edge_width_px) {
return KRInlineBoxAtomicTextEdgeStyle{0.0f, edge_width_px};
}

inline bool KRCanUseInlineBoxAtomicTextEdges(bool has_placeholder_child) {
return !has_placeholder_child;
}

// The layout skeleton for N ordinary-text children is:
// ZWSP NBHY (WJ child){N} WJ NBHY ZWSP
// Child payloads are emitted separately, so this count covers only the
// layout-only clusters surrounding them.
inline size_t KRInlineBoxAtomicLayoutOnlyClusterCount(size_t child_count) {
return child_count + 5;
}

} // namespace kuikly::richtext

#endif // CORE_RENDER_OHOS_KRINLINEBOXATOMICTEXTEDGE_H
151 changes: 114 additions & 37 deletions core-render-ohos/src/main/cpp/libohos_render/expand/components/richtext/KRRichTextShadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

#include "libohos_render/api/src/KRTextPostProcessor.h"
#include "libohos_render/expand/components/richtext/KRCustomEmojiPixmapCache.h"
#include "libohos_render/expand/components/richtext/KRInlineBoxAtomicTextEdge.h"
#include "libohos_render/expand/components/richtext/KRParagraph.h"
#include "libohos_render/expand/components/richtext/KRRichTextShadow.h"
#include "libohos_render/foundation/thread/KRMainThread.h"
Expand Down Expand Up @@ -71,7 +72,6 @@ namespace {

constexpr char16_t kSlockNonBreakingSpace = u'\u00A0';
constexpr char16_t kSlockZeroWidthBreak = u'\u200B';
constexpr char16_t kInlineBoxWordJoiner = u'\u2060';
constexpr char16_t kObjectReplacementCharacter = u'\uFFFC';
constexpr float kSlockInlineCodeInnerPaddingRatio = 4.0f / 15.0f;
constexpr float kSlockInlineCodeOuterMarginRatio = 2.0f / 15.0f;
Expand All @@ -83,6 +83,8 @@ constexpr char kInlineBoxGroupIndexKey[] = "__kr_inline_box_group_index__";
constexpr char kTopLevelSpanIndexKey[] = "__kr_top_level_span_index__";
constexpr char kInlineBoxChildIndexKey[] = "__kr_inline_box_child_index__";
constexpr char kInlineBoxPartKey[] = "__kr_inline_box_part__";
constexpr char kInlineBoxAtomicEdgeWidthKey[] = "__kr_inline_box_atomic_edge_width__";
constexpr char kInlineBoxPartBoundary[] = "boundary";
constexpr char kInlineBoxPartLeading[] = "leading";
constexpr char kInlineBoxPartGlue[] = "glue";
constexpr char kInlineBoxPartChild[] = "child";
Expand Down Expand Up @@ -579,12 +581,19 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
const float margin_end_vp = GetKRValue("inlineBoxMarginEnd", group_map, group_map)->toFloat();
float content_height_vp = GetKRValue("fontSize", group_map, props_)->toFloat();
if (content_height_vp <= 0) content_height_vp = 15.0f;
bool has_placeholder_child = false;
for (const auto &child : children) {
const auto child_map = child->toMap();
const float child_font = GetKRValue("fontSize", child_map, props_)->toFloat();
const float child_placeholder = GetKRValue("placeholderHeight", child_map, child_map)->toFloat();
has_placeholder_child = has_placeholder_child ||
GetKRValue("placeholderWidth", child_map, child_map)->toDouble() != 0 ||
GetKRValue("slockInlineCode", child_map, child_map)->toBool() ||
GetKRValue("slockInlineCodeTrailingMargin", child_map, child_map)->toBool();
content_height_vp = std::max(content_height_vp, std::max(child_font, child_placeholder));
}
const bool use_atomic_text_edges =
kuikly::richtext::KRCanUseInlineBoxAtomicTextEdges(has_placeholder_child);
const float box_height_vp = content_height_vp + padding_top_vp + padding_bottom_vp + border_vp * 2.0f;

KRInlineBoxGroupPlan plan;
Expand Down Expand Up @@ -614,18 +623,41 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
return map;
};

if (use_atomic_text_edges) {
auto leading_boundary = make_part(kInlineBoxPartBoundary);
leading_boundary.erase("placeholderWidth");
leading_boundary.erase("placeholderHeight");
leading_boundary["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxBoundaryBreak)));
leading_boundary["text"] = leading_boundary["value"];
flattened.push_back(KRRenderValue::Make(leading_boundary));
}

auto leading = make_part(kInlineBoxPartLeading);
leading["value"] = NewKRRenderValue(std::string(""));
leading["text"] = NewKRRenderValue(std::string(""));
leading["placeholderWidth"] = NewKRRenderValue(
static_cast<double>(margin_start_vp + border_vp + padding_start_vp));
leading["placeholderHeight"] = NewKRRenderValue(static_cast<double>(box_height_vp));
const float leading_edge_width_vp = margin_start_vp + border_vp + padding_start_vp;
if (use_atomic_text_edges) {
leading.erase("placeholderWidth");
leading.erase("placeholderHeight");
leading["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxReservedEdge)));
leading["text"] = leading["value"];
leading["fontFamily"] = NewKRRenderValue(std::string(""));
leading[kInlineBoxAtomicEdgeWidthKey] =
NewKRRenderValue(static_cast<double>(leading_edge_width_vp));
} else {
leading["value"] = NewKRRenderValue(std::string(""));
leading["text"] = NewKRRenderValue(std::string(""));
leading["placeholderWidth"] =
NewKRRenderValue(static_cast<double>(leading_edge_width_vp));
leading["placeholderHeight"] = NewKRRenderValue(static_cast<double>(box_height_vp));
}
flattened.push_back(KRRenderValue::Make(leading));

int child_index = 0;
for (const auto &child : children) {
auto glue = make_part(kInlineBoxPartGlue);
glue["value"] = NewKRRenderValue(KRUtf16ToUtf8(std::u16string(1, kInlineBoxWordJoiner)));
glue["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxWordJoiner)));
glue["text"] = glue["value"];
flattened.push_back(KRRenderValue::Make(glue));

Expand All @@ -639,18 +671,41 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
}

auto trailing_glue = make_part(kInlineBoxPartGlue);
trailing_glue["value"] = NewKRRenderValue(KRUtf16ToUtf8(std::u16string(1, kInlineBoxWordJoiner)));
trailing_glue["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxWordJoiner)));
trailing_glue["text"] = trailing_glue["value"];
flattened.push_back(KRRenderValue::Make(trailing_glue));

auto trailing = make_part(kInlineBoxPartTrailing);
trailing["value"] = NewKRRenderValue(std::string(""));
trailing["text"] = NewKRRenderValue(std::string(""));
trailing["placeholderWidth"] = NewKRRenderValue(
static_cast<double>(padding_end_vp + border_vp + margin_end_vp));
trailing["placeholderHeight"] = NewKRRenderValue(static_cast<double>(box_height_vp));
const float trailing_edge_width_vp = padding_end_vp + border_vp + margin_end_vp;
if (use_atomic_text_edges) {
trailing.erase("placeholderWidth");
trailing.erase("placeholderHeight");
trailing["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxReservedEdge)));
trailing["text"] = trailing["value"];
trailing["fontFamily"] = NewKRRenderValue(std::string(""));
trailing[kInlineBoxAtomicEdgeWidthKey] =
NewKRRenderValue(static_cast<double>(trailing_edge_width_vp));
} else {
trailing["value"] = NewKRRenderValue(std::string(""));
trailing["text"] = NewKRRenderValue(std::string(""));
trailing["placeholderWidth"] =
NewKRRenderValue(static_cast<double>(trailing_edge_width_vp));
trailing["placeholderHeight"] = NewKRRenderValue(static_cast<double>(box_height_vp));
}
flattened.push_back(KRRenderValue::Make(trailing));

if (use_atomic_text_edges) {
auto trailing_boundary = make_part(kInlineBoxPartBoundary);
trailing_boundary.erase("placeholderWidth");
trailing_boundary.erase("placeholderHeight");
trailing_boundary["value"] = NewKRRenderValue(KRUtf16ToUtf8(
std::u16string(1, kuikly::richtext::kInlineBoxBoundaryBreak)));
trailing_boundary["text"] = trailing_boundary["value"];
flattened.push_back(KRRenderValue::Make(trailing_boundary));
}

++top_level_index;
}
spans = std::move(flattened);
Expand Down Expand Up @@ -693,13 +748,45 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
semantic_text_content.append(semantic_text);
layout_to_semantic_offsets.push_back(semantic_text_content.size());
};
auto finalize_inline_box_group = [&](int span_index, KRInlineBoxGroupPlan *plan) {
if (!plan || plan->layout_start < 0 || layout_to_semantic_offsets.empty()) {
return;
}
semantic_text_content.append(plan->semantic_text);
// All layout-only edge/glue/child clusters map to the semantic start;
// crossing the trailing edge selects the full source token exactly once.
layout_to_semantic_offsets.back() = semantic_text_content.size();
plan->layout_end = charOffset;
span_offsets_.emplace_back(std::tuple(span_index, plan->layout_start, plan->layout_end));
context_thread_slock_chrome_runs_.push_back(
KRSlockChromeRun{
plan->layout_start,
plan->layout_end,
plan->fill_color,
plan->border_color,
plan->border_width_px,
plan->padding_start_px,
plan->padding_end_px,
plan->margin_start_px,
plan->margin_end_px,
plan->box_height_px,
plan->corner_radius_px,
true,
});
};
for (auto span : spans) {
auto spanMap = span->toMap();
const int spanIndex = GetKRValue(kTopLevelSpanIndexKey, spanMap, spanMap)->toInt();
const int inlineBoxGroupIndex = GetKRValue(kInlineBoxGroupIndexKey, spanMap, spanMap)->toInt();
const int inlineBoxChildIndex = GetKRValue(kInlineBoxChildIndexKey, spanMap, spanMap)->toInt();
const std::string inlineBoxPart = GetKRValue(kInlineBoxPartKey, spanMap, spanMap)->toString();
const bool isInlineBoxGroupPart = !inlineBoxPart.empty();
const bool isInlineBoxAtomicTextEdge =
(inlineBoxPart == kInlineBoxPartLeading || inlineBoxPart == kInlineBoxPartTrailing) &&
spanMap.find(kInlineBoxAtomicEdgeWidthKey) != spanMap.end();
const float inlineBoxAtomicEdgeWidthVp = isInlineBoxAtomicTextEdge
? GetKRValue(kInlineBoxAtomicEdgeWidthKey, spanMap, spanMap)->toFloat()
: 0.0f;
KRInlineBoxGroupPlan *inlineBoxGroupPlan = nullptr;
if (isInlineBoxGroupPart) {
auto plan_it = std::find_if(
Expand Down Expand Up @@ -853,7 +940,10 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
}
OH_Drawing_SetTextStyleForegroundBrush(txtStyle, textForegroundBrush);
}
OH_Drawing_SetTextStyleFontSize(txtStyle, fontSize);
const auto inlineBoxAtomicEdgeStyle =
kuikly::richtext::KRMakeInlineBoxAtomicTextEdgeStyle(inlineBoxAtomicEdgeWidthVp * dpi);
OH_Drawing_SetTextStyleFontSize(
txtStyle, isInlineBoxAtomicTextEdge ? inlineBoxAtomicEdgeStyle.font_size_px : fontSize);
OH_Drawing_SetTextStyleFontWeight(txtStyle, fontWeight);
OH_Drawing_SetTextStyleBaseLine(txtStyle, TEXT_BASELINE_ALPHABETIC);
OH_Drawing_SetTextStyleDecoration(txtStyle, textDecoration);
Expand All @@ -867,8 +957,11 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
}
}
OH_Drawing_SetTextStyleFontStyle(txtStyle, fontStyle);
if (letterSpacing > 0) {
OH_Drawing_SetTextStyleLetterSpacing(txtStyle, letterSpacing * dpi);
const double effectiveLetterSpacing = isInlineBoxAtomicTextEdge
? inlineBoxAtomicEdgeStyle.letter_spacing_px
: letterSpacing * dpi;
if (effectiveLetterSpacing > 0) {
OH_Drawing_SetTextStyleLetterSpacing(txtStyle, effectiveLetterSpacing);
}
if (lineSpacing > 0) {
OH_Drawing_SetTextStyleFontHeight(txtStyle, lineSpacing + std::max(lineHeight, 1.0));
Expand Down Expand Up @@ -970,28 +1063,9 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
}
placeholder_count++;
charOffset += 1;
append_placeholder_mapping({});
if (inlineBoxPart == kInlineBoxPartTrailing && inlineBoxGroupPlan) {
append_placeholder_mapping(inlineBoxGroupPlan->semantic_text);
inlineBoxGroupPlan->layout_end = charOffset;
span_offsets_.emplace_back(
std::tuple(spanIndex, inlineBoxGroupPlan->layout_start, inlineBoxGroupPlan->layout_end));
context_thread_slock_chrome_runs_.push_back(
KRSlockChromeRun{
inlineBoxGroupPlan->layout_start,
inlineBoxGroupPlan->layout_end,
inlineBoxGroupPlan->fill_color,
inlineBoxGroupPlan->border_color,
inlineBoxGroupPlan->border_width_px,
inlineBoxGroupPlan->padding_start_px,
inlineBoxGroupPlan->padding_end_px,
inlineBoxGroupPlan->margin_start_px,
inlineBoxGroupPlan->margin_end_px,
inlineBoxGroupPlan->box_height_px,
inlineBoxGroupPlan->corner_radius_px,
true,
});
} else {
append_placeholder_mapping({});
finalize_inline_box_group(spanIndex, inlineBoxGroupPlan);
}
} else if (slockInlineCodeTrailingMargin) {
// Android's KRSlockInlineCodeTrailingMarginSpan contract: the source
Expand Down Expand Up @@ -1112,6 +1186,9 @@ OH_Drawing_Typography *KRRichTextShadow::BuildTextTypography(double constraint_w
} else {
append_mapped_text(text16, text16, nullptr);
}
if (inlineBoxPart == kInlineBoxPartTrailing && inlineBoxGroupPlan) {
finalize_inline_box_group(spanIndex, inlineBoxGroupPlan);
}
}
OH_Drawing_DestroyTextStyle(txtStyle);
if (textForegroundPen) {
Expand Down
Loading
Loading