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

Fix definition conflicts with previous value #795

Merged
merged 3 commits into from
Mar 30, 2023
Merged

Fix definition conflicts with previous value #795

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7c22a5
fix: remove duplicated variable definition
1fabiopereira Mar 21, 2023
16186ca
chore: change CHANGELOG.md
1fabiopereira Mar 21, 2023
9335d17
Update CHANGELOG.md
1fabiopereira Mar 29, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Fix definition conflicts with previous value
1fabiopereira marked this conversation as resolved.
Show resolved Hide resolved

## [1.4.2] - 2023-03-20

Expand Down
3 changes: 1 addition & 2 deletions ios/Sources/AutoLayoutView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ import UIKit
fixLayout()
super.layoutSubviews()

let scrollView = getScrollView()
guard enableInstrumentation, let scrollView = scrollView else { return }
guard enableInstrumentation, let scrollView = getScrollView() else { return }

let scrollContainerSize = horizontal ? scrollView.frame.width : scrollView.frame.height
let currentScrollOffset = horizontal ? scrollView.contentOffset.x : scrollView.contentOffset.y
Expand Down