Skip to content
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

fix(NcActionX): Allow relative icon URL #4955

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mixins/actionText.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default {
computed: {
isIconUrl() {
try {
return new URL(this.icon)
return new URL(this.icon, this.icon.startsWith('/') ? window.location.origin : undefined)
} catch (error) {
return false
}
Expand Down
63 changes: 63 additions & 0 deletions tests/unit/components/NcActions/NcActionButton.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de>
*
* @author Ferdinand Thiessen <opensource@fthiessen.de>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import { mount } from '@vue/test-utils'

import NcActionButton from '../../../../src/components/NcActionButton/NcActionButton.vue'

describe('NcActionButton', () => {
it('supports icon classes', () => {
const wrapper = mount(NcActionButton, {
propsData: {
icon: 'icon-add'
},
slots: {
default: 'text',
},
})
expect(wrapper.find('.action-button__icon').classes('icon-add')).toBe(true)
})

it('supports icon URL', () => {
const wrapper = mount(NcActionButton, {
propsData: {
icon: 'http://example.com/icon.png'
},
slots: {
default: 'text',
},
})
expect(wrapper.find('.action-button__icon').attributes('style')).toContain('background-image: url(http://example.com/icon.png);')
})

it('supports relative icon URL', () => {
const wrapper = mount(NcActionButton, {
propsData: {
icon: '/icon.png',
},
slots: {
default: 'text',
},
})
expect(wrapper.find('.action-button__icon').attributes('style')).toContain('background-image: url(/icon.png);')
})
})