mirror of
https://github.com/wanderer-industries/wanderer
synced 2025-12-01 13:33:02 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f81f41f555 | ||
|
|
54c7b44d69 |
@@ -2,6 +2,15 @@
|
||||
|
||||
<!-- changelog -->
|
||||
|
||||
## [v1.52.4](https://github.com/wanderer-industries/wanderer/compare/v1.52.3...v1.52.4) (2025-02-21)
|
||||
|
||||
|
||||
|
||||
|
||||
### Bug Fixes:
|
||||
|
||||
* signature paste for russian lang
|
||||
|
||||
## [v1.52.3](https://github.com/wanderer-industries/wanderer/compare/v1.52.2...v1.52.3) (2025-02-21)
|
||||
|
||||
|
||||
|
||||
@@ -15,12 +15,16 @@ import {
|
||||
OTHER_COLUMNS_WIDTH,
|
||||
} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants';
|
||||
import {
|
||||
KEEP_LAZY_DELETE_SETTING,
|
||||
LAZY_DELETE_SIGNATURES_SETTING,
|
||||
SHOW_DESCRIPTION_COLUMN_SETTING,
|
||||
SHOW_UPDATED_COLUMN_SETTING,
|
||||
SHOW_CHARACTER_COLUMN_SETTING,
|
||||
} from '../SystemSignatures';
|
||||
|
||||
import {
|
||||
getGroupIdByRawGroup,
|
||||
GROUPS_LIST,
|
||||
} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
|
||||
|
||||
import { COSMIC_SIGNATURE } from '../SystemSignatureSettingsDialog';
|
||||
import {
|
||||
renderAddedTimeLeft,
|
||||
@@ -89,9 +93,6 @@ export function SystemSignaturesContent({
|
||||
const isCompact = useMaxWidth(tableRef, COMPACT_MAX_WIDTH);
|
||||
const isMedium = useMaxWidth(tableRef, MEDIUM_MAX_WIDTH);
|
||||
|
||||
const lazyDeleteEnabled = settings.find(s => s.key === LAZY_DELETE_SIGNATURES_SETTING)?.value ?? false;
|
||||
const keepLazyDeleteEnabled = settings.find(s => s.key === KEEP_LAZY_DELETE_SETTING)?.value ?? false;
|
||||
|
||||
const { clipboardContent, setClipboardContent } = useClipboard();
|
||||
useEffect(() => {
|
||||
if (selectable) return;
|
||||
@@ -99,19 +100,8 @@ export function SystemSignaturesContent({
|
||||
|
||||
handlePaste(clipboardContent.text);
|
||||
|
||||
if (lazyDeleteEnabled && !keepLazyDeleteEnabled) {
|
||||
onLazyDeleteChange?.(false);
|
||||
}
|
||||
setClipboardContent(null);
|
||||
}, [
|
||||
selectable,
|
||||
clipboardContent,
|
||||
handlePaste,
|
||||
setClipboardContent,
|
||||
lazyDeleteEnabled,
|
||||
keepLazyDeleteEnabled,
|
||||
onLazyDeleteChange,
|
||||
]);
|
||||
}, [selectable, clipboardContent]);
|
||||
|
||||
useHotkey(true, ['a'], handleSelectAll);
|
||||
useHotkey(false, ['Backspace', 'Delete'], handleDeleteSelected);
|
||||
@@ -165,11 +155,14 @@ export function SystemSignaturesContent({
|
||||
if (hideLinkedSignatures && sig.linked_system) {
|
||||
return false;
|
||||
}
|
||||
if (sig.kind === COSMIC_SIGNATURE) {
|
||||
const isCosmicSignature = sig.kind === COSMIC_SIGNATURE;
|
||||
|
||||
if (isCosmicSignature) {
|
||||
const showCosmic = settings.find(y => y.key === COSMIC_SIGNATURE)?.value;
|
||||
if (!showCosmic) return false;
|
||||
if (sig.group) {
|
||||
return enabledGroups.includes(sig.group);
|
||||
const preparedGroup = getGroupIdByRawGroup(sig.group);
|
||||
return enabledGroups.includes(preparedGroup);
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
|
||||
@@ -16,13 +16,15 @@ export const parseSignatures = (value: string, availableKeys: string[]): SystemS
|
||||
|
||||
const kind = MAPPING_TYPE_TO_ENG[sigArrInfo[1] as SignatureKind];
|
||||
|
||||
outArr.push({
|
||||
const signature: SystemSignature = {
|
||||
eve_id: sigArrInfo[0],
|
||||
kind: availableKeys.includes(kind) ? kind : SignatureKind.CosmicSignature,
|
||||
group: sigArrInfo[2] as SignatureGroup,
|
||||
name: sigArrInfo[3],
|
||||
type: '',
|
||||
});
|
||||
};
|
||||
|
||||
outArr.push(signature);
|
||||
}
|
||||
|
||||
return outArr;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { CharacterTypeRaw, SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
|
||||
import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
|
||||
|
||||
export enum SignatureGroup {
|
||||
CosmicSignature = 'Cosmic Signature',
|
||||
@@ -33,7 +33,7 @@ export type SignatureCustomInfo = {
|
||||
|
||||
export type SystemSignature = {
|
||||
eve_id: string;
|
||||
character_eve_id: string;
|
||||
character_eve_id?: string;
|
||||
character_name?: string;
|
||||
kind: SignatureKind;
|
||||
name: string;
|
||||
|
||||
Reference in New Issue
Block a user