Merge pull request #94 from layoutBox/remove_not_supported_baseline_alignItems

lucdion · web-flow · commit 63543d97f2b2 · 2018-05-31T06:32:01.000-04:00
alignItems `.baseline` is not currently supported by Yoga
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode9.3
 
 cache:
   directories:
diff --git a/Example/FlexLayoutSample.xcodeproj/project.pbxproj b/Example/FlexLayoutSample.xcodeproj/project.pbxproj
@@ -575,6 +575,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -626,6 +627,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -641,7 +643,7 @@
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -655,7 +657,7 @@
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
diff --git a/Example/FlexLayoutSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/FlexLayoutSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -91,8 +91,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "iTunesArtwork@2x.png",
       "scale" : "1x"
     }
   ],
diff --git a/Example/FlexLayoutSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/Example/FlexLayoutSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
diff --git a/FlexLayout.xcodeproj/project.pbxproj b/FlexLayout.xcodeproj/project.pbxproj
@@ -518,6 +518,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG XCODE_PROJECT_BUILD";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -576,6 +577,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -609,7 +611,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -638,7 +640,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
@@ -653,7 +655,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -668,7 +670,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
diff --git a/README.md b/README.md
@@ -516,7 +516,7 @@ The `justifyContent` property defines the alignment along the main-axis of the c
 
 ### alignItems()
 - Applies to: `flex containers`
-- Values: `stretch` / `start` / `end` / `center` / `baseline`
+- Values: `stretch` / `start` / `end` / `center`
 - Default value: `stretch `
 - CSS name: `align-items` 
 
@@ -532,7 +532,9 @@ The `alignItems` property defines how flex items are laid out along the cross ax
 | **start**	| <img src="docs_markdown/images/flexlayout-align-column-flexStart.png" width="140"/>| <img src="docs_markdown/images/flexlayout-align-row-flexStart.png" width="160"/>|
 | **end**	| <img src="docs_markdown/images/flexlayout-align-column-flexEnd.png" width="140"/>| <img src="docs_markdown/images/flexlayout-align-row-flexEnd.png" width="160"/>|
 | **center** 	| <img src="docs_markdown/images/flexlayout-align-column-center.png" width="140"/>| <img src="docs_markdown/images/flexlayout-align-row-center.png" width="160"/>|
-| **baseline** 	| | <img src="docs_markdown/images/flexlayout-align-row-baseline.png" width="160"/>|
+
+NOTE: alignItems `.baseline` is not currently supported by FlexLayout/Yoga.
+
 
 <br/>
 
diff --git a/Sources/FlexLayout.swift b/Sources/FlexLayout.swift
@@ -1108,7 +1108,8 @@ public final class Flex {
         /// Items are positioned at the end of the container
         case end
         /// Items are positioned at the baseline of the container
-        case baseline
+        // Not currently supported by Yoga.
+        //case baseline
     }
     
     /**
diff --git a/Sources/Impl/FlexLayout+Enum.swift b/Sources/Impl/FlexLayout+Enum.swift
@@ -58,7 +58,7 @@ extension Flex.AlignItems {
         case .start:        return YGAlign.flexStart
         case .center:       return YGAlign.center
         case .end:          return YGAlign.flexEnd
-        case .baseline:     return YGAlign.baseline
+        //case .baseline:     return YGAlign.baseline
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,9 @@`
`91`	`91`	`"scale" : "2x"`
`92`	`92`	`},`
`93`	`93`	`{`
`94`		`- "idiom" : "ios-marketing",`
`95`	`94`	`"size" : "1024x1024",`
	`95`	`+ "idiom" : "ios-marketing",`
	`96`	`+ "filename" : "[email protected]",`
`96`	`97`	`"scale" : "1x"`
`97`	`98`	`}`
`98`	`99`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,8 @@ public final class Flex {`
`1108`	`1108`	`/// Items are positioned at the end of the container`
`1109`	`1109`	`case end`
`1110`	`1110`	`/// Items are positioned at the baseline of the container`
`1111`		`- case baseline`
	`1111`	`+ // Not currently supported by Yoga.`
	`1112`	`+ //case baseline`
`1112`	`1113`	`}`
`1113`	`1114`
`1114`	`1115`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ extension Flex.AlignItems {`
`58`	`58`	`case .start: return YGAlign.flexStart`
`59`	`59`	`case .center: return YGAlign.center`
`60`	`60`	`case .end: return YGAlign.flexEnd`
`61`		`- case .baseline: return YGAlign.baseline`
	`61`	`+ //case .baseline: return YGAlign.baseline`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`