Fix cxx textlayoutmanager breaking issues.

1. Move files into react/renderer/textlayoutmanager/ to support other building system. This convention follows Android textlayoutmanager. 2. Add empty TextLayoutManager::measureLines() to fix build error.
Kudo · Oct 8, 2020 · b11c103 · b11c103
1 parent 8e943d8
commit b11c103
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/ReactCommon/react/renderer/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK
@@ -44,19 +44,19 @@ rn_xplat_cxx_library(
     ],
     cxx_exported_headers = subdir_glob(
         [
-            ("platform/cxx", "*.h"),
+            ("platform/cxx/react/renderer/textlayoutmanager", "**/*.h"),
         ],
         prefix = "react/renderer/textlayoutmanager",
     ),
     cxx_headers = subdir_glob(
         [
-            ("platform/cxx", "**/*.h"),
+            ("platform/cxx/react/renderer/textlayoutmanager", "**/*.h"),
         ],
         prefix = "",
     ),
     cxx_srcs = glob(
         [
-            "platform/cxx/**/*.cpp",
+            "platform/cxx/react/renderer/textlayoutmanager/**/*.cpp",
         ],
     ),
     cxx_tests = [":tests"],

diff --git a/...anager/platform/cxx/TextLayoutManager.cpp → ...r/textlayoutmanager/TextLayoutManager.cpp b/...anager/platform/cxx/TextLayoutManager.cpp → ...r/textlayoutmanager/TextLayoutManager.cpp
@@ -23,5 +23,12 @@ TextMeasurement TextLayoutManager::measure(
   return TextMeasurement{{0, 0}, {}};
 }
 
+LinesMeasurements TextLayoutManager::measureLines(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    Size size) const {
+  return LinesMeasurements{};
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/...tmanager/platform/cxx/TextLayoutManager.h → ...rer/textlayoutmanager/TextLayoutManager.h b/...tmanager/platform/cxx/TextLayoutManager.h → ...rer/textlayoutmanager/TextLayoutManager.h
@@ -40,6 +40,15 @@ class TextLayoutManager {
       ParagraphAttributes paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
+  /*
+   * Measures lines of `attributedString` using native text rendering
+   * infrastructure.
+   */
+  LinesMeasurements measureLines(
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      Size size) const;
+
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.