-
-
Notifications
You must be signed in to change notification settings - Fork 35
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.
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
added color and layout customization #35
Open
H3RSKO
wants to merge
3
commits into
vadimdemedes:master
Choose a base branch
from
Sophont-Technologies:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
declare type Colors = | ||
| 'black' | ||
| 'red' | ||
| 'green' | ||
| 'yellow' | ||
| 'blue' | ||
| 'magenta' | ||
| 'cyan' | ||
| 'white' | ||
| 'gray' | ||
| 'grey' | ||
| 'blackBright' | ||
| 'redBright' | ||
| 'greenBright' | ||
| 'yellowBright' | ||
| 'blueBright' | ||
| 'magentaBright' | ||
| 'cyanBright' | ||
| 'whiteBright'; | ||
|
||
export default Colors; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,17 @@ | ||
import * as React from 'react'; | ||
import type {FC} from 'react'; | ||
import {Text} from 'ink'; | ||
import Colors from './Colors'; | ||
|
||
export interface Props { | ||
isSelected?: boolean; | ||
label: string; | ||
defaultColor?: Colors; | ||
accentColor?: Colors; | ||
} | ||
|
||
const Item: FC<Props> = ({isSelected = false, label}) => ( | ||
<Text color={isSelected ? 'blue' : undefined}>{label}</Text> | ||
const Item: FC<Props> = ({isSelected = false, label, defaultColor, accentColor}) => ( | ||
<Text color={isSelected ? accentColor : defaultColor}>{label}</Text> | ||
); | ||
|
||
export default Item; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ import Indicator from './Indicator'; | |
import type {Props as IndicatorProps} from './Indicator'; | ||
import Item from './Item'; | ||
import type {Props as ItemProps} from './Item'; | ||
import Colors from './Colors'; | ||
|
||
interface Props<V> { | ||
/** | ||
|
@@ -54,6 +55,15 @@ interface Props<V> { | |
* Function to call when user highlights an item. Item object is passed to that function as an argument. | ||
*/ | ||
onHighlight?: (item: Item<V>) => void; | ||
|
||
defaultColor?: Colors; | ||
// Any color i.e: 'red', 'green' etc | ||
|
||
accentColor?: Colors; | ||
// Any color i.e: 'red', 'green' etc | ||
|
||
displayDirection?: 'column' | 'row'; | ||
// Either 'row' or 'column' | ||
} | ||
|
||
export interface Item<V> { | ||
|
@@ -71,7 +81,10 @@ function SelectInput<V>({ | |
itemComponent = Item, | ||
limit: customLimit, | ||
onSelect, | ||
onHighlight | ||
onHighlight, | ||
defaultColor, | ||
accentColor, | ||
displayDirection = 'column' | ||
}: Props<V>): JSX.Element { | ||
const [rotateIndex, setRotateIndex] = useState(0); | ||
const [selectedIndex, setSelectedIndex] = useState(initialIndex); | ||
|
@@ -98,7 +111,7 @@ function SelectInput<V>({ | |
useInput( | ||
useCallback( | ||
(input, key) => { | ||
if (input === 'k' || key.upArrow) { | ||
if (input === 'k' || key.upArrow || key.leftArrow) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should determine which keys to listen to based on the list direction. Otherwise if direction is |
||
const lastIndex = (hasLimit ? limit : items.length) - 1; | ||
const atFirstIndex = selectedIndex === 0; | ||
const nextIndex = hasLimit ? selectedIndex : lastIndex; | ||
|
@@ -119,7 +132,8 @@ function SelectInput<V>({ | |
} | ||
} | ||
|
||
if (input === 'j' || key.downArrow) { | ||
// Allows tabbing through elements | ||
if (input === 'j' || key.downArrow || key.tab || key.rightArrow) { | ||
const atLastIndex = | ||
selectedIndex === (hasLimit ? limit : items.length) - 1; | ||
const nextIndex = hasLimit ? selectedIndex : 0; | ||
|
@@ -166,14 +180,14 @@ function SelectInput<V>({ | |
: items; | ||
|
||
return ( | ||
<Box flexDirection="column"> | ||
<Box flexDirection={displayDirection}> | ||
{slicedItems.map((item, index) => { | ||
const isSelected = index === selectedIndex; | ||
|
||
return ( | ||
<Box key={item.key ?? item.value}> | ||
{React.createElement(indicatorComponent, {isSelected})} | ||
{React.createElement(itemComponent, {...item, isSelected})} | ||
{React.createElement(indicatorComponent, {isSelected, accentColor})} | ||
{React.createElement(itemComponent, {...item, isSelected, defaultColor, accentColor})} | ||
</Box> | ||
); | ||
})} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are quite a few comments I have on this change to colors, could you extract these changes into a separate PR?