Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/react-devtools-core-…
Browse files Browse the repository at this point in the history
…4.28.5
  • Loading branch information
miblanchard authored Mar 24, 2024
2 parents b221fbc + 2c62ca8 commit 5963254
Show file tree
Hide file tree
Showing 32 changed files with 330 additions and 190 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
62 changes: 0 additions & 62 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: '42 11 * * 3'

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
language: [ 'javascript-typescript' ]
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
30 changes: 30 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn
- run: yarn test
31 changes: 0 additions & 31 deletions .github/workflows/nodejs.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/npm-publish.yml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @miblanchard/react-native-slider

![Node.js CI](https://github.com/miblanchard/react-native-slider/workflows/Node.js%20CI/badge.svg?branch=main)
[![Node.js CI](https://github.com/miblanchard/react-native-slider/actions/workflows/node.js.yml/badge.svg)](https://github.com/miblanchard/react-native-slider/actions/workflows/node.js.yml)
[![npm version](https://img.shields.io/npm/v/@miblanchard/react-native-slider.svg?style=flat-square)](https://npmjs.org/package/@miblanchard/react-native-slider 'View this project on npm')
[![npm downloads](http://img.shields.io/npm/dm/@miblanchard/react-native-slider.svg?style=flat-square)](https://npmjs.org/package/@miblanchard/react-native-slider 'View this project on npm')
[![npm licence](http://img.shields.io/npm/l/@miblanchard/react-native-slider.svg?style=flat-square)](https://npmjs.org/package/@miblanchard/react-native-slider 'View this project on npm')
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@miblanchard/react-native-slider",
"version": "2.5.0",
"version": "2.6.0",
"description": "A pure JavaScript <Slider /> component for react-native",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
48 changes: 31 additions & 17 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,34 +212,48 @@ export class Slider extends PureComponent<SliderProps, SliderState> {
}
}

componentDidUpdate(prevProps) {
componentDidUpdate(prevProps: any) {
// Check if the value prop has changed
if (this.props.value !== prevProps.value) {
// @ts-ignore
const newValues = normalizeValue(this.props, this.props.value);

this.setState({
values: updateValues({
values: this.state.values,
newValues: newValues,
}),
}, () => {
newValues.forEach((value, i) => {
const currentValue = this.state.values[i].__getValue();
if (value !== currentValue && this.props.animateTransitions) {
this._setCurrentValueAnimated(value, i);
} else {
this._setCurrentValue(value, i);
}
});
});
// eslint-disable-next-line react/no-did-update-set-state
this.setState(
{
values: updateValues({
values: this.state.values,
newValues: newValues,
}),
},
() => {
newValues.forEach((value, i) => {
// @ts-ignore
const currentValue = this.state.values[i].__getValue();
if (
value !== currentValue &&
this.props.animateTransitions
) {
this._setCurrentValueAnimated(value, i);
} else {
this._setCurrentValue(value, i);
}
});
},
);
}

// Check for other prop changes that might require state updates, e.g., trackMarks
if (this.props.trackMarks !== prevProps.trackMarks) {
const newTrackMarksValues = normalizeValue(this.props, this.props.trackMarks);
const newTrackMarksValues = normalizeValue(
this.props,
this.props.trackMarks,
);

// eslint-disable-next-line react/no-did-update-set-state
this.setState({
trackMarksValues: updateValues({
// @ts-ignore
values: this.state.trackMarksValues,
newValues: newTrackMarksValues,
}),
Expand Down
Loading

0 comments on commit 5963254

Please sign in to comment.