@olea-bps/base 1.1.4 → 1.1.6

package/components/AppbarAction/index.js

@@ -0,0 +1,42 @@
+import { useCallback } from 'react';
+import { ColorValue } from 'react-native';
+
+import {
+    Appbar,
+    useTheme,
+} from 'react-native-paper';
+
+import IconsOpenasist from '../../libraries/icons-openasist';
+
+/**
+ * Eine Action, welche die Icons über die {@link IconsOpenasist}-Komponente einbindet.
+ * Es werden alle Properties der {@link Appbar.Action}-Komponente unterstüzt.
+ * Die `icon`-Property wird auf eine andere Art und Weise verwendet.
+ * Wird keine Farbe übergeben, wird die primäre Textfarbe (`primaryText`) aus den Theme verwendet.
+ *
+ * @param {object} props - Es werden die Properties der {@link Appbar.Action}-Komponente unsterstützt
+ * @param {string} props.icon - Name eines Icons, welches über die {@link IconsOpenasist} angezeigt werden kann.
+ * @param {?ColorValue} props.color - Farbe des Icons. Wenn keine Farbe übergeben wird, wird die primäre Textfarbe (`primaryText`) aus den Theme verwendet.
+ * @returns
+ */
+export default function AppbarAction({ icon, color, ...rest }) {
+    const theme = useTheme();
+    const iconColor = color ?? theme?.colors?.primaryText;
+
+    const iconCallback = useCallback(
+        props =>
+            <IconsOpenasist
+                {...props}
+                icon={icon}
+                color={iconColor}
+            />,
+        [icon, iconColor]
+    );
+
+    return (
+        <Appbar.Action
+            {...rest}
+            icon={iconCallback}
+        />
+    );
+}

package/components/BookDetail/index.js

@@ -30,8 +30,9 @@ import { libraryApi } from '../../libraries/core';
 import { handleHtmlEntities } from '../../libraries/core/helper/format.helper';
 
 
-import componentStyles from "./styles"
+import componentStyles from './styles';
 import AppbarComponent from '../AppBar';
+import AppbarAction from '../AppbarAction';
 
 
 class BookDetailComponent extends React.Component {
@@ -248,9 +249,11 @@ class BookDetailComponent extends React.Component {
 
         return (
             <SafeAreaView style={[this.styles.container, themeStyles.safeAreaContainer]}>
-                <AppbarComponent {...this.props}
-                                 title={t('search:title')}
-                                 rightAction={<Appbar.Action icon="share-variant" onPress={this._onShare.bind(this)}/>}/>
+                <AppbarComponent
+                    {...this.props}
+                    title={t('search:title')}
+                    rightAction={<AppbarAction icon='share' onPress={this._onShare.bind(this)} />}
+                />
                 {this._renderContent()}
             </SafeAreaView>
         );

package/components/ContactDetail/index.js

@@ -12,29 +12,34 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import {
+    useCallback,
+    useMemo
+} from 'react';
 
 import {
-    StyleSheet,
-    Text,
-    View,
+    Linking,
+    Platform,
     SafeAreaView,
+    ScrollView,
     Share,
-    Linking,
+    StyleSheet,
+    Text,
     TouchableOpacity,
-    Platform,
-    ScrollView
+    View,
 } from 'react-native';
-import {Appbar, Headline, List, withTheme} from "react-native-paper";
+import {
+    Headline,
+    List,
+    useTheme,
+} from "react-native-paper";
 
-import { connect } from 'react-redux'
-import {withTranslation} from "react-i18next";
-import merge from 'lodash/merge';
+import { useTranslation } from "react-i18next";
 
-import componentStyles from "./styles"
+import componentStyles from './styles';
 import AppbarComponent from '../AppBar';
-
+import AppbarAction from '../AppbarAction';
+import { default as Icon } from '../../libraries/icons-openasist';
 
 /**
  * Contact Detail Component
@@ -42,191 +47,168 @@ import AppbarComponent from '../AppBar';
  * Shows the detailed information of a contact with name and contact details.
  * Provides a share functionality.
  *
- * Parameters:
- *  - contact: Contact object with all information about the contact
- *
- * Navigation-Parameters:
- *  - none
+ * @param {object} props
+ * @param {object} props.contact - Der anzuzeigende Kontakt
  */
-class ContactDetailComponent extends React.Component {
-    static propTypes = {
-        contact: PropTypes.object.isRequired
-    };
-
-    // Styles of this component
-    styles;
-
-    contact = null;
-
-
-    constructor(props) {
-        super(props);
-        // ------------------------------------------------------------------------
-        // PLUGIN FUNCTIONALITY
-        // ------------------------------------------------------------------------
-
-        const { pluginStyles,theme } = this.props;
-        this.styles = componentStyles(theme);
-
-        if(pluginStyles) {
-            this.styles = merge(this.styles, pluginStyles);
-        }
-
-        this.styles = StyleSheet.create(this.styles);
-
-        // ------------------------------------------------------------------------
-    };
-
-    /**
-     * Share function for contact
-     *
-     * @returns {Promise<void>}
-     * @private
-     */
-    async _onShare() {
-        try {
-            const { t } = this.props;
-
-            let phone = "";
-            if(this.contact.telephone.length > 0) {
-                phone += "\n"+ t('contact:phone') +": ";
-                this.contact.telephone.forEach((phoneNumber) => {
-                    phone += phoneNumber.number + '\n';
+export default function ContactDetailComponent({ contact, ...restProps }) {
+    const theme = useTheme();
+    const { themeStyles } = theme;
+    const { t } = useTranslation();
+
+    const styles = useMemo(
+        () => StyleSheet.create(componentStyles(theme)),
+        [theme, componentStyles]
+    );
+
+    const onShare = useCallback(
+        async () => {
+            try {
+                // Telephone-Objekte aus dem Kontakt auslesen. Falls diese nicht vorhanden sind, mit einem leeren Array initialisieren
+                const contactTelephones = contact?.telephone ?? [];
+                const shareMessageTelephoneNumbers = contactTelephones
+                    .map(telephone => telephone.number)
+                    .map(number => `${t('contact:phone')}: ${number}`)
+                    .join('\n');
+
+                const shareMessage = `${t('contact:title')} - ${contact.firstName} ${contact.lastName}`
+                    +
+                    (
+                        contact?.building
+                            ? `\n${t('contact:building')}: ${contact.building}`
+                            : ''
+                    )
+                    +
+                    (
+                        contact?.department
+                            ? `\n${t('contact:department')}: ${contact.department}`
+                            : ''
+                    )
+                    +
+                    (
+                        contact?.room?.title
+                            ? `\n${t('contact:room')}: ${contact.room.title}`
+                            : ''
+                    )
+                    +
+                    (
+                        contact?.email
+                            ? `\n${t('contact:email')}: ${contact.email}`
+                            : ''
+                    )
+                    +
+                    (
+                        shareMessageTelephoneNumbers
+                            ? '\n' + shareMessageTelephoneNumbers
+                            : ''
+                    );
+
+                await Share.share({
+                    message: shareMessage,
                 });
+            } catch (error) {
+                alert(error.message);
             }
-
-            let message = t('contact:title') + ' - ' + this.contact.firstName + ' ' + this.contact.lastName +
-                ((this.contact.building)                        ? "\n" + t('contact:building') + ": " + this.contact.building       : '') +
-                ((this.contact.department)                      ? "\n" + t('contact:department') + ": " + this.contact.department   : '') +
-                ((this.contact.room && this.contact.room.title) ? "\n" + t('contact:room') + ": " + this.contact.room.title         : '') +
-                ((this.contact.email)                           ? "\n" + t('contact:email') + ": " + this.contact.email             : '') +
-                phone;
-
-            const result = await Share.share({
-                message: message
-            });
-
-            if (result.action === Share.sharedAction) {
-                if (result.activityType) {
-                    // shared with activity type of result.activityType
-                } else {
-                    // shared
+        },
+        [contact, t]
+    );
+
+    return contact
+        ? <SafeAreaView style={[styles.container, themeStyles.safeAreaContainer]}>
+            <AppbarComponent
+                {...restProps}
+                title={t('contact:contactInformation')}
+                rightAction={<AppbarAction icon='share' onPress={onShare} />}
+            />
+            <ScrollView style={styles.containerInner}>
+                <Headline style={styles.name}>{contact.firstName} {contact.lastName}</Headline>
+                {
+                    contact?.building
+                        ? <List.Item
+                            key="building"
+                            title={t('contact:building')}
+                            description={contact.building}
+                            descriptionStyle={themeStyles.textLighter}
+                            titleStyle={themeStyles.searchDetailTitle}
+                            descriptionNumberOfLines={200} />
+                        : null
                 }
-            } else if (result.action === Share.dismissedAction) {
-                // dismissed
-            }
-        } catch (error) {
-                alert(error.message);
-        }
-    };
-
-    /**
-     * Render contact details content
-     *
-     * @returns {*}
-     * @private
-     */
-    _renderContent = () => {
-        const { contact, t } = this.props;
-        const { themeStyles } = this.props.theme;
-
-        let output = [];
-        let index = 1;
-
-
-
-
-        if(contact.building)
-            output.push(<List.Item key="building" title={t('contact:building')}   description={contact.building}
-                                   descriptionStyle={themeStyles.textLighter} titleStyle={themeStyles.searchDetailTitle}
-                                   descriptionNumberOfLines={200}/>);
-
-        if(contact.department)
-            output.push(<List.Item key="department" title={t('contact:department')} description={contact.department}
-                                   descriptionStyle={themeStyles.textLighter} titleStyle={themeStyles.searchDetailTitle}
-                                   descriptionNumberOfLines={200}/>);
-
-        if(contact.room && contact.room.title)
-            output.push(<List.Item key="room" title={t('contact:room')} description={contact.room.title}
-                                   descriptionStyle={themeStyles.textLighter} titleStyle={themeStyles.searchDetailTitle}
-                                   descriptionNumberOfLines={200}/>);
-
-        if(contact.email)
-            output.push(<TouchableOpacity key="email" onPress={() => Linking.openURL('mailto:' + contact.email)}>
-                            <List.Item title={t('contact:email')} description={contact.email}
-                                descriptionStyle={themeStyles.textLighter} titleStyle={themeStyles.searchDetailTitle}
-                                right={props => <List.Icon {...props} icon="email"/>}/>
-                        </TouchableOpacity>
-            );
-
-        if(contact.telephone.length > 0) {
-            contact.telephone.forEach((phoneNumber) => {
-                output.push(
-                    <TouchableOpacity key={'phone_'+ index} onPress={() => {
-                        const formattedPhoneNumber = phoneNumber.number.replace(/\s/g, '');
-                        Linking.openURL('tel:' + formattedPhoneNumber).catch(error => console.error(`ContactDetailComponent - Fehler beim öffnen des Telefons ${Platform.OS}`, error));
-                        }}>
-                        <List.Item
-                            title={t('contact:phone') + ' ' + index}
-                            description={phoneNumber.number}
+                {
+                    contact?.department
+                        ? <List.Item
+                            key="department"
+                            title={t('contact:department')}
+                            description={contact.department}
                             descriptionStyle={themeStyles.textLighter}
                             titleStyle={themeStyles.searchDetailTitle}
-                            right={props =>
-                                <List.Icon {...props}
-                                           icon="phone"/>}
-                        />
-                  </TouchableOpacity>
-                );
-                index++;
-            });
-        }
-
-
-        return (
-            <ScrollView style={this.styles.containerInner}>
-                <Headline style={this.styles.name}>{contact.firstName} {contact.lastName}</Headline>
-                {output}
-                <View style={this.styles.space}/>
+                            descriptionNumberOfLines={200} />
+                        : null
+                }
+                {
+                    contact?.room && contact?.room?.title
+                        ? <List.Item
+                            key="room"
+                            title={t('contact:room')}
+                            description={contact.room.title}
+                            descriptionStyle={themeStyles.textLighter}
+                            titleStyle={themeStyles.searchDetailTitle}
+                            descriptionNumberOfLines={200} />
+                        : null
+                }
+                {
+                    contact?.email
+                        ? <TouchableOpacity
+                            key="email"
+                            onPress={() => Linking.openURL('mailto:' + contact.email)}
+                        >
+                            <List.Item
+                                title={t('contact:email')}
+                                description={contact.email}
+                                descriptionStyle={themeStyles.textLighter}
+                                titleStyle={themeStyles.searchDetailTitle}
+                                right={props => <List.Icon {...props} icon="email" />}
+                            />
+                        </TouchableOpacity>
+                        : null
+                }
+                {
+                    Array.isArray(contact?.telephone)
+                        ? contact.telephone.map(
+                            (telephone, index, telephones) => {
+
+                                const title = telephones.length == 1
+                                    ? t('contact:phone')
+                                    : t('contact:phone') + ' ' + index;
+
+                                const telephoneNumber = telephone.number
+
+                                return (
+                                    <TouchableOpacity
+                                        key={telephoneNumber}
+                                        onPress={
+                                            () => {
+                                                const formattedPhoneNumber = telephone.number.replace(/\s/g, '');
+                                                Linking.openURL('tel:' + formattedPhoneNumber).catch(error => console.error(`ContactDetailComponent - Fehler beim öffnen des Telefons ${Platform.OS}`, error));
+                                            }
+                                        }
+                                    >
+                                        <List.Item
+                                            title={title}
+                                            description={telephoneNumber}
+                                            descriptionStyle={themeStyles.textLighter}
+                                            titleStyle={themeStyles.searchDetailTitle}
+                                            right={props => <Icon {...props} icon={'call'} />}
+                                        />
+                                    </TouchableOpacity>
+                                )
+                            }
+                        )
+                        : null
+                }
+                <View style={styles.space} />
             </ScrollView>
-        );
-    };
-
-    render() {
-        // ------------------------------------------------------------------------
-        // PLUGIN FUNCTIONALITY
-        // ------------------------------------------------------------------------
-        const PluginComponent = this.props.pluginComponent;
-        if (PluginComponent) {
-            return <PluginComponent />;
-        }
-        // ------------------------------------------------------------------------
-
-        const {themeStyles} = this.props.theme;
-        const { contact, t } = this.props;
-
-        if(!contact){
-            return (<Text>{t('contact:couldNotLoad')}</Text>);
-        }
-
-        this.contact = contact;
-
-        return (
-            <SafeAreaView style={[this.styles.container, themeStyles.safeAreaContainer]}>
-                <AppbarComponent {...this.props}
-                                 title={t('contact:contactInformation')}
-                                 rightAction={<Appbar.Action icon="share-variant" onPress={this._onShare.bind(this)}/>}/>
-                {this._renderContent()}
-            </SafeAreaView>
-        );
-    }
-}
-
-
-const mapStateToProps = state => {
-    return {
-        pluginComponent: state.pluginReducer.contactDetail.component,
-        pluginStyles: state.pluginReducer.contactDetail.styles
-    };
-};
+        </SafeAreaView>
 
-export default connect(mapStateToProps, null)(withTranslation()(withTheme(ContactDetailComponent)))
+        : <Text>
+            {t('contact:couldNotLoad')}
+        </Text>;
+}

package/components/CourseDetail/index.js

@@ -24,10 +24,11 @@ import {Appbar, Headline, List, withTheme} from "react-native-paper";
 import { connect } from 'react-redux'
 import merge from 'lodash/merge';
 
-import componentStyles from "./styles"
+import componentStyles from './styles';
 import AppbarComponent from '../AppBar';
+import AppbarAction from '../AppbarAction';
 import IconsOpenasist from '../../libraries/icons-openasist';
-import {withTranslation} from "react-i18next";
+import { withTranslation } from 'react-i18next';
 
 
 /**
@@ -339,9 +340,11 @@ class CourseDetailComponent extends React.Component {
 
         return (
             <SafeAreaView style={[this.styles.container, themeStyles.appSafeAreaContainer]}>
-                <AppbarComponent {...this.props}
-                                 title={t('course:lectureInformation')}
-                                 rightAction={<Appbar.Action icon="share-variant" onPress={this._onShare.bind(this)}/>}/>
+                <AppbarComponent
+                    {...this.props}
+                    title={t('course:lectureInformation')}
+                    rightAction={<AppbarAction icon='share' onPress={this._onShare.bind(this)} />}
+                />
                 {this._renderContent()}
             </SafeAreaView>
         );

package/components/NewsDetail/index.js

@@ -37,8 +37,9 @@ import moment from "moment";
 import WebViewAutoHeight from '../../libraries/react-native-webview-autoheight';
 
 
-import componentStyles from "./styles"
+import componentStyles from './styles';
 import AppbarComponent from '../AppBar';
+import AppbarAction from '../AppbarAction';
 import { selectFeedById } from '../../libraries/core/redux/reducers/api';
 
 
@@ -350,9 +351,15 @@ class NewsDetailComponent extends React.Component {
 
         return (
             <SafeAreaView style={[this.styles.container, themeStyles.appSafeAreaContainer]}>
-                <AppbarComponent {...this.props}
-                                 title={title}
-                                 rightAction={newsType ? null : <Appbar.Action icon="share-variant" onPress={this._onShare.bind(this)}/>}/>
+                <AppbarComponent
+                    {...this.props}
+                    title={title}
+                    rightAction={
+                        newsType
+                            ? null
+                            : <AppbarAction icon='share' onPress={this._onShare.bind(this)} />
+                    }
+                />
                 {newsType === NewsDetailComponent.newsTypes.topNews ? this._renderTopNewsContent(news) : this._renderContent(news)}
             </SafeAreaView>
         );

package/components/RoomDetail/index.js

@@ -20,17 +20,22 @@ import {
     Share,
     TouchableOpacity, ActivityIndicator
 } from 'react-native';
-import {connect} from 'react-redux'
-import {Appbar, Headline, List, withTheme} from "react-native-paper";
-import {withTranslation} from "react-i18next";
+import { connect } from 'react-redux'
+import {
+    Appbar,
+    Headline,
+    List,
+    withTheme,
+} from "react-native-paper";
+import { withTranslation } from "react-i18next";
+import { WebView } from "react-native-webview";
 import merge from 'lodash/merge';
 
-
 import AppbarComponent from '../AppBar';
+import AppbarAction from '../AppbarAction';
 import IconsOpenasist from '../../libraries/icons-openasist';
 
-import componentStyles from "./styles";
-import {WebView} from "react-native-webview";
+import componentStyles from './styles';
 
 /**
  * Room Detail Component
@@ -262,9 +267,11 @@ class RoomDetailComponent extends React.Component {
 
         return (
             <SafeAreaView style={[this.styles.container, themeStyles.safeAreaContainer]}>
-                <AppbarComponent {...this.props}
-                             title={t('room:directory')}
-                             rightAction={<Appbar.Action icon="share-variant" onPress={this._onShare.bind(this)}/>}/>
+                <AppbarComponent
+                    {...this.props}
+                    title={t('room:directory')}
+                    rightAction={<AppbarAction icon='share' onPress={this._onShare.bind(this)} />}
+                />
                 {this._renderContent()}
             </SafeAreaView>
         );

package/index.js

@@ -2,7 +2,9 @@
 // Exports Components
 
 export { default as AppBar } from './components/AppBar';
+export { default as AppbarAction } from './components/AppbarAction';
 export { default as BookDetail } from './components/BookDetail';
+export { default as ComponentJobsFilter } from './components/ComponentJobsFilter';
 export { default as ConnectivityWarning } from './components/ConnectivityWarning';
 export { default as ContactDetail } from './components/ContactDetail';
 export { default as CourseDetail } from './components/CourseDetail';
@@ -26,10 +28,10 @@ export { default as QuickLinks } from './components/QuickLinks';
 export { default as RoomDetail } from './components/RoomDetail';
 export { default as ScaledImage } from './components/ScaledImage';
 export { default as SearchResults } from './components/SearchResults';
-export { default as SettingSection } from './components/SettingSection';
 export { default as SettingsDialog } from './components/SettingsDialog';
 export { default as SettingsDialogRadio } from './components/SettingsDialogRadio';
 export { default as SettingsDialogSelect } from './components/SettingsDialogSelect';
+export { default as SettingSection } from './components/SettingSection';
 export { default as TimetableCodeInput } from './components/TimetableCodeInput';
 export { default as TimetableDay } from './components/TimetableDay';
 export { default as TimetableEvent } from './components/TimetableEvent';
@@ -39,7 +41,6 @@ export { default as TimetableWeek } from './components/TimetableWeek';
 export { default as TopNews } from './components/TopNews';
 export { default as TopNewsHtwk } from './components/TopNewsHtwk';
 export { default as WebView } from './components/WebView';
-export { default as ComponentJobsFilter } from './components/ComponentJobsFilter';
 
 // Exports Views
 

package/libraries/icons-openasist/index.js

@@ -12,70 +12,69 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React from 'react'
 
-import { useTheme } from "react-native-paper";
-import createIconSet from '@expo/vector-icons/createIconSet';
-import PropTypes from "prop-types";
-import { SvgCssUri } from 'react-native-svg';
-const glyphMap = {
-    "bus":                      "a",
-    "train":                    "b",
-    "close":                    "c",
-    "messages":                 "d",
-    "menu":                     "e",
-    "grid":                     "f",
-    "more-horizontal":          "g",
-    "more-vertical":            "h",
-    "paperplane-outline":       "i",
-    "partlysunny":              "j",
-    "partlysunny-outline":      "k",
-    "rainy":                    "l",
-    "rainy-outline":            "m",
-    "thunderstorm":             "n",
-    "thunderstorm-outline":     "o",
-    "sunny":                    "p",
-    "sunny-outline":            "q",
-    "down":                     "r",
-    "download":                 "s",
-    "print":                    "t",
-    "hilfe":                    "u",
-    "back":                     "v",
-    "lock":                     "w",
-    "lock-open":                "x",
-    "navigation":               "y",
-    "forward":                  "z",
-    "profile":                  "A",
-    "opal":                     "B",
-    "mensa":                    "C",
-    "location":                 "D",
-    "inbox":                    "E",
-    "imprint":                  "F",
-    "pts":                      "G",
-    "feedback":                 "H",
-    "book":                     "I",
-    "news":                     "J",
-    "up":                       "K",
-    "tram":                     "L",
-    "rss":                      "M",
-    "map-search":               "N",
-    "m-start1":                 "O",
-    "dashboard":                "P",
-    "timetable":                "Q",
-    "search":                   "R",
-    "settings":                 "S",
-    "coffee":                   "T",
-    "check":                    "V",
-    "star":                     "W",
-    "star-selected":            "X",
-    "edit":                     "Y",
-    "time":                     "A1",
-    "open-external":            "A2",
-    "share":                    "1",
-    "accessibility":            "A3",
-};
-const CustomIcon = createIconSet(glyphMap, 'openasist');
+import { useTheme } from 'react-native-paper'
+import createIconSet from '@expo/vector-icons/createIconSet'
+import PropTypes from 'prop-types'
 
+const glyphMap = {
+  bus: 'a',
+  train: 'b',
+  close: 'c',
+  messages: 'd',
+  menu: 'e',
+  grid: 'f',
+  'more-horizontal': 'g',
+  'more-vertical': 'h',
+  'paperplane-outline': 'i',
+  partlysunny: 'j',
+  'partlysunny-outline': 'k',
+  rainy: 'l',
+  'rainy-outline': 'm',
+  thunderstorm: 'n',
+  'thunderstorm-outline': 'o',
+  sunny: 'p',
+  'sunny-outline': 'q',
+  down: 'r',
+  download: 's',
+  print: 't',
+  hilfe: 'u',
+  back: 'v',
+  lock: 'w',
+  'lock-open': 'x',
+  navigation: 'y',
+  forward: 'z',
+  profile: 'A',
+  opal: 'B',
+  mensa: 'C',
+  location: 'D',
+  inbox: 'E',
+  imprint: 'F',
+  pts: 'G',
+  feedback: 'H',
+  book: 'I',
+  news: 'J',
+  up: 'K',
+  tram: 'L',
+  rss: 'M',
+  'map-search': 'N',
+  'm-start1': 'O',
+  dashboard: 'P',
+  timetable: 'Q',
+  search: 'R',
+  settings: 'S',
+  coffee: 'T',
+  check: 'V',
+  star: 'W',
+  'star-selected': 'X',
+  edit: 'Y',
+  time: 'A1',
+  'open-external': 'A2',
+  share: '1',
+  accessibility: 'A3'
+}
+const CustomIcon = createIconSet(glyphMap, 'openasist')
 
 /**
  * Icons of the Openasist app
@@ -97,62 +96,62 @@ const CustomIcon = createIconSet(glyphMap, 'openasist');
  * Navigation-Parameters:
  *  - none
  */
-function IconsOpenasist({ icon, iconSVG: IconSVG, size, color, accessibilityLabel, ...props }) {
-    const theme = useTheme();
-    const { AppIcons } = theme;
-    const ThemeIcon = theme.icons?.[icon];
+function IconsOpenasist ({ icon, iconSVG: IconSVG, size, color, accessibilityLabel, ...props }) {
+  const theme = useTheme()
+  const { AppIcons } = theme
+  const ThemeIcon = theme.icons?.[icon]
 
-    const iconSize = size ?? 26;
-    const iconAriaLabel = props?.['aria-label'] ?? accessibilityLabel ?? null;
-    const iconAriaHidden = iconAriaLabel ? false : true;
+  const iconSize = size ?? 24
+  const iconAriaLabel = props?.['aria-label'] ?? accessibilityLabel ?? null
+  const iconAriaHidden = !iconAriaLabel
 
-    const iconProps = {
-        color: color ?? 'black',
-        'aria-hidden': iconAriaHidden,
-        'aria-label': iconAriaLabel,
-    }
+  const iconProps = {
+    color: color ?? 'black',
+    'aria-hidden': iconAriaHidden,
+    'aria-label': iconAriaLabel
+  }
 
-    if (IconSVG) {
-        return (
-            <IconSVG
-                {...iconProps}
-                width={iconSize}
-                height={iconSize}
-            />
-        );
-    } else if (typeof ThemeIcon === 'function') {
-        return (
-            <ThemeIcon
-                {...iconProps}
-                width={iconSize}
-                height={iconSize}
-            />
-        );
-    } else if (AppIcons) {
-        return (
-            <AppIcons
-                {...iconProps}
-                name={icon}
-                size={iconSize}
-            />
-        );
-    } else {
-        return (
-            <CustomIcon
-                {...iconProps}
-                name={icon}
-                size={iconSize}
-            />
-        );
-    }
+  if (IconSVG) {
+    return (
+      <IconSVG
+        {...iconProps}
+        width={iconSize}
+        height={iconSize}
+      />
+    )
+  } else if (typeof ThemeIcon === 'function') {
+    return (
+      <ThemeIcon
+        {...iconProps}
+        width={iconSize}
+        height={iconSize}
+      />
+    )
+  } else if (AppIcons) {
+    return (
+      <AppIcons
+        {...iconProps}
+        name={icon}
+        size={iconSize}
+      />
+    )
+  } else {
+    return (
+      <CustomIcon
+        {...iconProps}
+        name={icon}
+        size={iconSize}
+      />
+    )
+  }
 }
 
 // propTypes für Funktionen wird in react.js 19 entfernt
 IconsOpenasist.propTypes = {
-    icon: PropTypes.string,
-    iconSVG: PropTypes.func,
-    size: PropTypes.number,
-    color: PropTypes.string
-};
+  icon: PropTypes.string,
+  iconSVG: PropTypes.func,
+  size: PropTypes.number,
+  color: PropTypes.string
+}
 
-export default IconsOpenasist;
+export default IconsOpenasist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olea-bps/base",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "OLEA base library",
   "main": "index.js",
   "repository": {