Skip to content

fix: add padding on unbalanced leading/trailing #12

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

Merged
sbertix merged 2 commits into from
Dec 4, 2022
Merged

fix: add padding on unbalanced leading/trailing #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d81f288
fix: add padding on unbalanced leading/trailing
sbertix Dec 4, 2022
b3521e3
chore(actions): finetune GitHub actions
sbertix Dec 4, 2022
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 .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Pull Request
on:
pull_request:
branches: [main]
types: [opened, synchronize, closed]
types: [opened, synchronize]

jobs:
# pull request-sepcific steps.
Expand Down
54 changes: 15 additions & 39 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ name: Release

on:
push:
branches: [main]
branches: [main]

jobs:
# lint code.
lint:
name: Lint
runs-on: ubuntu-latest
name: Lint
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v3
# only lint on actual code changes.
- name: Lint
uses: norio-nomura/[email protected]
- name: Lint
uses: norio-nomura/[email protected]
env:
DIFF_BASE: ${{ github.event.push.before }}
DIFF_BASE: ${{ github.event.push.before }}
with:
args: --strict
args: --strict

# build the library.
build:
Expand Down Expand Up @@ -49,38 +49,14 @@ jobs:
runs-on: ubuntu-latest

steps:
# checkout `main`.
- name: Checkout
id: checkout
uses: actions/checkout@v3
- name: Release version
id: release-version
uses: tomtom-international/commisery-action/bump@v1
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
ref: main
# create the changelog.
- name: Changelog
id: changelog
uses: TriPSs/conventional-changelog-action@v3
with:
git-message: "chore(release): relase \'v{version}\'"
git-user-name: "github-actions"
git-user-email: "41898282+github-actions[bot]@users.noreply.github.com"
github-token: ${{ secrets.GITHUB_TOKEN }}
tag-prefix: ''
output-file: 'false'
skip-commit: 'true'
skip-version-file: 'true'
# release the new version.
- name: Release
id: release
uses: actions/create-release@v1
if: ${{ steps.changelog.outputs.skipped == 'false' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.changelog.outputs.tag }}
release_name: v${{ steps.changelog.outputs.tag }}
body: ${{ steps.changelog.outputs.clean_changelog }}
create-release: true
create-tag: true
version-prefix: v

# create docs.
docs:
Expand Down
48 changes: 29 additions & 19 deletions Sources/DropView/Views/DropView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,40 @@ public struct DropView<Content: View, Leading: View, Trailing: View>: View {
/// The underlying view.
public var body: some View {
HStack(spacing: horizontalSpacing) {
leading
.fixedSize()
.aspectRatio(contentMode: .fit)
.frame(width: accessoryWidth, alignment: .leading)
.background(GeometryReader {
Color.clear.preference(key: NewDropViewWidthPreferenceKey.self, value: [$0.size.width])
})
if case .default = balancing,
leading is EmptyView,
!(trailing is EmptyView) {
// Add balancing when there's no `leading`.
Color.clear.frame(width: accessoryWidth ?? 0)
} else {
leading
.fixedSize()
.aspectRatio(contentMode: .fit)
.frame(width: accessoryWidth, alignment: .leading)
.background(GeometryReader {
Color.clear.preference(key: NewDropViewWidthPreferenceKey.self, value: [$0.size.width])
})
}
// `content` should be automatically
// displayed vertically.
VStack(spacing: verticalSpacing) {
content.fixedSize()
}.multilineTextAlignment(.center)
trailing
.fixedSize()
.aspectRatio(contentMode: .fit)
.frame(width: accessoryWidth, alignment: .trailing)
.background(GeometryReader {
Color.clear.preference(key: NewDropViewWidthPreferenceKey.self, value: [$0.size.width])
})

if case .default = balancing,
!(leading is EmptyView),
trailing is EmptyView {
// Add balancing when there's no `trailing`.
Color.clear.frame(width: accessoryWidth ?? 0)
} else {
trailing
.fixedSize()
.aspectRatio(contentMode: .fit)
.frame(width: accessoryWidth, alignment: .trailing)
.background(GeometryReader {
Color.clear.preference(key: NewDropViewWidthPreferenceKey.self, value: [$0.size.width])
})
}
}
.fixedSize(horizontal: false, vertical: true)
// Handle changes to accessory widths.
Expand Down Expand Up @@ -128,11 +143,6 @@ struct Previews_DropView_Previews: PreviewProvider { // swiftlint:disable:this t
.imageScale(.large)
.font(.headline)
.foregroundColor(.secondary)
} trailing: {
Image(systemName: "star.circle.fill")
.resizable()
.frame(width: 40, height: 40)
.foregroundColor(.accentColor)
}
.padding(40)
.previewLayout(.sizeThatFits)
Expand Down