Skip to content
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

Jump to bottom

Fix field with multiple constraints. #77

Closed
wants to merge 3 commits into from
Closed

Fix field with multiple constraints. #77

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0e8a3
Add index to field when multiple constraints.
fortmarek May 9, 2018
4c3905d
Refactor.
fortmarek May 9, 2018
7e28ece
Change constrain naming.
fortmarek May 9, 2018
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: 1 addition & 1 deletion Example/Source/Component/Examples/ProgressView/ProgressViewRootView.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
progress="0.8"
progressTintColor="red"
trackTintColor="green"
layout:fillHorizontally="super inset(20)"
layout:fillHorizontally="progressFill = super inset(20)"
layout:centerY="super" />

</Component>
11 changes: 10 additions & 1 deletion Sources/Tokenizer/Layout/Constraints/Constraint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ public struct Constraint {
public static func constraints(name: String, attribute: XMLAttribute) throws -> [Constraint] {
let layoutAttributes = try LayoutAttribute.deserialize(name)
let tokens = Lexer.tokenize(input: attribute.text)
return try layoutAttributes.flatMap { try ConstraintParser(tokens: tokens, layoutAttribute: $0).parse() }
var constraints = try layoutAttributes.flatMap { try ConstraintParser(tokens: tokens, layoutAttribute: $0).parse() }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it could be possible to create a tuple that would let me use the constraintName along with the constraint itself? Something like constraintName.left?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean like this:

indexedConstraint.field = field + ".\(constraint.attribute)"

(outputs eg: "progressFill.right")
Or I was thinking I could add a property multipleConstraint: Bool and add the suffix in LiveUIApplier.swift.
Using tuple would maybe unnecessarily duplicate the field and attribute ... ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the inner workings of ReactantUI in this area, but I'm thinking about creating a tuple so that when you want to reference a constraint in Swift code, you don't have to check whether you're working with right or left variant by using indices and using progressFill.left instead.

Again, not sure if it's even possible if RUI is not ready for this kind of approach.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, tuple solution would be great, but AFAICT it would not be very easy to do. Maybe first fix this bug and then create another issue marked as enhancement ... ?

if constraints.count > 1 {
for (index, constraint) in constraints.enumerated() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this could be easily refactored into a more functional style.

guard let field = constraint.field else { break }
var indexedConstraint = constraint
indexedConstraint.field = field + "\(index)"
constraints[index] = indexedConstraint
}
}
return constraints
}

func serialize() -> XMLSerializableAttribute {
Expand Down