feat: fixing microsdeck dependency #129
Merged
Conversation
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
CEbbinghaus
commented
Nov 20, 2023
src/components/filters/Filters.ts
Outdated
Comment on lines
91
to
92
| "current card": "Selects apps that are present on the current MicroSD Card", | ||
| "on card": "Selects apps that are present on a given MicroSD Card" |
There was a problem hiding this comment.
Rename to "Current MicroSD Card" & "On MicroSD Card"
|
This follows on from #128 I am planning to address a lot of the comments from it here |
# Conflicts: # src/components/filters/FilterSelect.tsx
# Conflicts: # src/index.tsx # src/state/TabMasterManager.tsx
CEbbinghaus
force-pushed
the
Feat/MicroSDeckIntegration
branch
from
bd89c61 to
fcdadbd
Compare
CEbbinghaus
force-pushed
the
Feat/MicroSDeckIntegration
branch
from
aa6e202 to
f2b8825
Compare
jessebofill
reviewed
Nov 28, 2023
| "@cebbinghaus/microsdeck": "0.9.6-3b08037", | ||
| "@cebbinghaus/microsdeck": "0.9.7-ea88921", |
Comment on lines
-66
to
+52
| <Focusable | ||
| focusWithinClassName="gpfocuswithin" | ||
| onActivate={focusable || selected === filterType ? () => {} : undefined} | ||
| style={{ width: "100%", margin: 0, marginBottom: "10px", padding: 0 }} | ||
| onOKButton={focusable || selected === filterType ? () => handleSelect(filterType) : undefined} | ||
| > | ||
| <div | ||
| className={achievementClasses.AchievementListItemBase} | ||
| style={{ display: "flex", flexDirection: "column", padding: "0.5em", height: "60px" }} | ||
| > | ||
| <div className="entry-label">{capitalizeEachWord(filterType)}</div> | ||
| <div className="entry-desc">{filterDescriptions[filterType]}</div> | ||
| </div> | ||
| </Focusable> | ||
| <FilterSelectElement | ||
| disabled={disabled} | ||
| filterType={filterType} | ||
| handleSelect={focusable || selected === filterType ? () => handleSelect(filterType) : undefined} | ||
| /> |
Comment on lines
+61
to
+97
| interface FilterSelectElement { | ||
| filterType: FilterType, | ||
| disabled: boolean, | ||
| handleSelect: (() => void) | undefined; | ||
| } | ||
|
|
||
| /** | ||
| * Individual Filter in the filter selection Modal | ||
| */ | ||
| const FilterSelectElement: VFC<FilterSelectElement> = ({ filterType, disabled, handleSelect }) => { | ||
|
|
||
| const pluginSource = FilterPluginSource[filterType]; | ||
|
|
||
| const pluginNotice = !pluginSource ? "" : ( | ||
| <small style={{ marginLeft: "0.5em", fontSize: "0.5em" }}>(requires {pluginSource})</small> | ||
| ); | ||
|
|
||
| return ( | ||
| <Focusable | ||
| focusWithinClassName="gpfocuswithin" | ||
| style={{ width: "100%", margin: 0, marginBottom: "10px", padding: 0 }} | ||
| onOKButton={disabled ? e => e.preventDefault() : handleSelect} | ||
| > | ||
| <div | ||
| className={`${achievementClasses.AchievementListItemBase} ${disabled && "entry-disabled"}`} | ||
| style={{ display: "flex", flexDirection: "column", padding: "0.5em", height: "60px" }} | ||
| > | ||
| <div className="entry-label"> | ||
| {capitalizeEachWord(filterType)} | ||
| {pluginNotice} | ||
| </div> | ||
| <div className="entry-desc">{FilterDescriptions[filterType]}</div> | ||
| </div> | ||
| </Focusable> | ||
| ); | ||
| } | ||
|
|
Comment on lines
+119
to
+140
| /** | ||
| * Which plugin needs to be installed for this filter to be active | ||
| */ | ||
| export const FilterPluginSource: { [key in FilterType]?: PluginSources } = { | ||
| "sd card": "MicroSDeck", | ||
| }; | ||
|
|
||
| /** | ||
| * Whether the filter is disabled (cannot be selected or run) | ||
| * @param filter The filter to check. | ||
| * @returns True if the filter should be considered disabled | ||
| */ | ||
| export function isFilterDisabled(filter: FilterType): boolean { | ||
| switch (filter) { | ||
| case "sd card": | ||
| return !MicroSDeck | ||
| default: | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR cleans up some of the previous dependencies on MicroSDeck to make fallback behavior cleaner for when MicroSDeck is not installed.
Goals: