Merge branch 'charmbracelet:master' into feature/style-title

.github/dependabot.yml

@@ -0,0 +1,32 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "08:00"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "feat"
+      include: "scope"
+  - package-ecosystem: "gomod"
+    directory: "/example"
+    schedule:
+      interval: "daily"
+      time: "08:00"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "08:00"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.1.0
 
       - name: Download Go modules
         run: go mod download

.github/workflows/coverage.yml

@@ -0,0 +1,28 @@
+name: coverage
+on: [push, pull_request]
+
+jobs:
+  coverage:
+    strategy:
+      matrix:
+        go-version: [^1]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    env:
+      GO111MODULE: "on"
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3.1.0
+
+      - name: Coverage
+        env:
+          COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          go test -race -covermode atomic -coverprofile=profile.cov ./...
+          GO111MODULE=off go get github.com/mattn/goveralls
+          $(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github

.github/workflows/lint-soft.yml

@@ -13,9 +13,14 @@ jobs:
     name: lint-soft
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v3.1.0
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: golangci-lint command line arguments.
           args: --config .golangci-soft.yml --issues-exit-code=0

.github/workflows/lint.yml

@@ -13,9 +13,14 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v3.1.0
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: golangci-lint command line arguments.
           #args:

README.md

@@ -59,7 +59,7 @@ lipgloss.Color("#04B575") // a green
 lipgloss.Color("#3C3C3C") // a dark gray
 ```
 
-...as well as a 1-bit Ascii profile, which is black and white only.
+...as well as a 1-bit ASCII profile, which is black and white only.
 
 The terminal's color profile will be automatically detected, and colors outside
 the gamut of the current palette will be automatically coerced to their closest
@@ -417,16 +417,23 @@ the stylesheet-based Markdown renderer.
 [glamour]: https://github.com/charmbracelet/glamour
 
 
+## Feedback
+
+We’d love to hear your thoughts on this project. Feel free to drop us a note!
+
+* [Twitter](https://twitter.com/charmcli)
+* [The Fediverse](https://mastodon.social/@charmcli)
+* [Discord](https://charm.sh/chat)
+
 ## License
 
 [MIT](https://github.com/charmbracelet/lipgloss/raw/master/LICENSE)
 
-
 ***
 
 Part of [Charm](https://charm.sh).
 
-<a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge-unrounded.jpg" width="400"></a>
+<a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge.jpg" width="400"></a>
 
 Charm热爱开源 • Charm loves open source
 

borders.go

@@ -84,6 +84,39 @@ var (
 		BottomRight: "╯",
 	}
 
+	blockBorder = Border{
+		Top:         "█",
+		Bottom:      "█",
+		Left:        "█",
+		Right:       "█",
+		TopLeft:     "█",
+		TopRight:    "█",
+		BottomLeft:  "█",
+		BottomRight: "█",
+	}
+
+	outerHalfBlockBorder = Border{
+		Top:         "▀",
+		Bottom:      "▄",
+		Left:        "▌",
+		Right:       "▐",
+		TopLeft:     "▛",
+		TopRight:    "▜",
+		BottomLeft:  "▙",
+		BottomRight: "▟",
+	}
+
+	innerHalfBlockBorder = Border{
+		Top:         "▄",
+		Bottom:      "▀",
+		Left:        "▐",
+		Right:       "▌",
+		TopLeft:     "▗",
+		TopRight:    "▖",
+		BottomLeft:  "▝",
+		BottomRight: "▘",
+	}
+
 	thickBorder = Border{
 		Top:         "━",
 		Bottom:      "━",
@@ -129,6 +162,21 @@ func RoundedBorder() Border {
 	return roundedBorder
 }
 
+// BlockBorder returns a border that takes the whole block.
+func BlockBorder() Border {
+	return blockBorder
+}
+
+// OuterHalfBlockBorder returns a half-block border that sits outside the frame.
+func OuterHalfBlockBorder() Border {
+	return outerHalfBlockBorder
+}
+
+// InnerHalfBlockBorder returns a half-block border that sits inside the frame.
+func InnerHalfBlockBorder() Border {
+	return innerHalfBlockBorder
+}
+
 // ThickBorder returns a border that's thicker than the one returned by
 // NormalBorder.
 func ThickBorder() Border {

color.go

@@ -1,7 +1,6 @@
 package lipgloss
 
 import (
-	"image/color"
 	"sync"
 
 	"github.com/muesli/termenv"
@@ -142,9 +141,9 @@ func (c Color) color() termenv.Color {
 // RGBA returns the RGBA value of this color. This satisfies the Go Color
 // interface. Note that on error we return black with 100% opacity, or:
 //
-// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFF.
+// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF.
 func (c Color) RGBA() (r, g, b, a uint32) {
-	return hexToColor(c.value()).RGBA()
+	return termenv.ConvertToRGB(c.color()).RGBA()
 }
 
 // AdaptiveColor provides color options for light and dark backgrounds. The
@@ -173,10 +172,9 @@ func (ac AdaptiveColor) color() termenv.Color {
 // RGBA returns the RGBA value of this color. This satisfies the Go Color
 // interface. Note that on error we return black with 100% opacity, or:
 //
-// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFF.
+// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF.
 func (ac AdaptiveColor) RGBA() (r, g, b, a uint32) {
-	cf := hexToColor(ac.value())
-	return cf.RGBA()
+	return termenv.ConvertToRGB(ac.color()).RGBA()
 }
 
 // CompleteColor specifies exact values for truecolor, ANSI256, and ANSI color
@@ -207,9 +205,9 @@ func (c CompleteColor) color() termenv.Color {
 // RGBA returns the RGBA value of this color. This satisfies the Go Color
 // interface. Note that on error we return black with 100% opacity, or:
 //
-// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF
+// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF.
 func (c CompleteColor) RGBA() (r, g, b, a uint32) {
-	return hexToColor(c.value()).RGBA()
+	return termenv.ConvertToRGB(c.color()).RGBA()
 }
 
 // CompleteColor specifies exact values for truecolor, ANSI256, and ANSI color
@@ -234,52 +232,7 @@ func (cac CompleteAdaptiveColor) color() termenv.Color {
 // RGBA returns the RGBA value of this color. This satisfies the Go Color
 // interface. Note that on error we return black with 100% opacity, or:
 //
-// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF
+// Red: 0x0, Green: 0x0, Blue: 0x0, Alpha: 0xFFFF.
 func (cac CompleteAdaptiveColor) RGBA() (r, g, b, a uint32) {
-	return hexToColor(cac.value()).RGBA()
-}
-
-// hexToColor translates a hex color string (#RRGGBB or #RGB) into a color.RGB,
-// which satisfies the color.Color interface. If an invalid string is passed
-// black with 100% opacity will be returned: or, in hex format, 0x000000FF.
-func hexToColor(hex string) (c color.RGBA) {
-	c.A = 0xFF
-
-	if hex == "" || hex[0] != '#' {
-		return c
-	}
-
-	const (
-		fullFormat  = 7 // #RRGGBB
-		shortFormat = 4 // #RGB
-	)
-
-	switch len(hex) {
-	case fullFormat:
-		const offset = 4
-		c.R = hexToByte(hex[1])<<offset + hexToByte(hex[2])
-		c.G = hexToByte(hex[3])<<offset + hexToByte(hex[4])
-		c.B = hexToByte(hex[5])<<offset + hexToByte(hex[6])
-	case shortFormat:
-		const offset = 0x11
-		c.R = hexToByte(hex[1]) * offset
-		c.G = hexToByte(hex[2]) * offset
-		c.B = hexToByte(hex[3]) * offset
-	}
-
-	return c
-}
-
-func hexToByte(b byte) byte {
-	const offset = 10
-	switch {
-	case b >= '0' && b <= '9':
-		return b - '0'
-	case b >= 'a' && b <= 'f':
-		return b - 'a' + offset
-	case b >= 'A' && b <= 'F':
-		return b - 'A' + offset
-	}
-	// Invalid, but just return 0.
-	return 0
+	return termenv.ConvertToRGB(cac.color()).RGBA()
 }