Merge branch 'main' into patch-1

YogaKit/BUCK

@@ -1,67 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "subdir_glob", "yoga_apple_library", "yoga_apple_test", "yoga_dep")
-
-COMPILER_FLAGS = [
-    "-fobjc-arc",
-    "-Wconditional-uninitialized",
-    "-Wdangling-else",
-    "-Wdeprecated-declarations",
-    "-Wimplicit-retain-self",
-    "-Wincomplete-implementation",
-    "-Wobjc-method-access",
-    "-Wobjc-missing-super-calls",
-    "-Wmismatched-return-types",
-    "-Wreturn-type",
-    "-Wno-global-constructors",
-    "-Wno-shadow",
-    "-Wunused-const-variable",
-    "-Wunused-function",
-    "-Wunused-property-ivar",
-    "-Wunused-result",
-    "-Wunused-value",
-]
-
-yoga_apple_library(
-    name = "YogaKit",
-    srcs = glob(["Source/**/*.m"]),
-    header_namespace = "",
-    exported_headers = subdir_glob(
-        [
-            ("", "Source/**/*.h"),
-            ("Source", "**/*.h"),
-        ],
-        prefix = "YogaKit",
-    ),
-    compiler_flags = COMPILER_FLAGS,
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
-    header_path_prefix = "",
-    link_whole = True,
-    modular = True,
-    module_name = "YogaKit",
-    visibility = ["PUBLIC"],
-    deps = [
-        yoga_dep(":yoga"),
-    ],
-)
-
-yoga_apple_test(
-    name = "YogaKitTests",
-    srcs = glob(["Tests/**/*.m"]),
-    compiler_flags = COMPILER_FLAGS,
-    frameworks = [
-        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-    ],
-    info_plist = "Tests/Info.plist",
-    visibility = ["PUBLIC"],
-    deps = [
-        ":YogaKit",
-    ],
-)

YogaKit/README.md

@@ -12,9 +12,8 @@ pod 'YogaKit', '~> 1.7'
 ```
 
 ## Getting Started
-Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
 
-We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/main/YogaKit/YogaKitSample) directory.
+We have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/main/YogaKit/YogaKitSample) directory.
 
 ## Contributing
 We welcome all pull-requests! At Facebook we sync the open source version of `YogaKit` daily, so we're always testing the latest changes.

YogaKit/Source/UIView+Yoga.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/UIView+Yoga.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout+Private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -175,6 +175,7 @@ static YGConfigRef globalConfig;
   globalConfig = YGConfigNew();
   YGConfigSetExperimentalFeatureEnabled(
       globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetErrata(globalConfig, YGErrataClassic);
   YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
@@ -285,6 +286,10 @@ YG_VALUE_PROPERTY(maxWidth, MaxWidth)
 YG_VALUE_PROPERTY(maxHeight, MaxHeight)
 YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
+YG_EDGE_PROPERTY(columnGap, ColumnGap, Gap, YGGutterColumn)
+YG_EDGE_PROPERTY(rowGap, RowGap, Gap, YGGutterRow)
+YG_EDGE_PROPERTY(gap, Gap, Gap, YGGutterAll)
+
 #pragma mark - Layout and Sizing
 
 - (YGDirection)resolvedDirection {

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Tests/YogaKitTests.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -252,6 +252,10 @@
 }
 
 - (void)testFrameAndOriginPlacement {
+  // https://www.internalfb.com/intern/test/562950017690956
+  XCTSkip(
+      @"TODO: this test fails with actual dimensions off by 1px from expected");
+
   const CGSize containerSize = CGSizeMake(320, 50);
 
   UIView* container = [[UIView alloc]

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.